From 6f222162a7b840f73ad4e645af5bcdf5649ef7b8 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Sat, 25 Aug 2007 20:04:26 +0000 Subject: [PATCH] * vc-git.el (vc-git-mode-line-string): New function. --- lisp/ChangeLog | 4 ++++ lisp/vc-git.el | 14 +++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d81cf3a4691..1e061579124 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2007-08-25 Alexandre Julliard + + * vc-git.el (vc-git-mode-line-string): New function. + 2007-08-25 Alan Mackenzie * progmodes/cc-langs.el (c-other-decl-block-key-in-symbols-alist): diff --git a/lisp/vc-git.el b/lisp/vc-git.el index 156b2866eb9..32d8d48299c 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el @@ -57,7 +57,7 @@ ;; - latest-on-branch-p (file) NOT NEEDED ;; * checkout-model (file) OK ;; - workfile-unchanged-p (file) OK -;; - mode-line-string (file) NOT NEEDED +;; - mode-line-string (file) OK ;; - dired-state-info (file) OK ;; STATE-CHANGING FUNCTIONS ;; * create-repo () OK @@ -208,6 +208,18 @@ (string-match "[0-7]\\{6\\} blob \\([0-9a-f]\\{40\\}\\)\t[^\0]+\0" head) (string= (car (split-string sha1 "\n")) (match-string 1 head))))) +(defun vc-git-mode-line-string (file) + "Return string for placement into the modeline for FILE." + (let* ((branch (vc-git-workfile-version file)) + (def-ml (vc-default-mode-line-string 'Git file)) + (help-echo (get-text-property 0 'help-echo def-ml))) + (if (zerop (length branch)) + (propertize + (concat def-ml "!") + 'help-echo (concat help-echo "\nNo current branch (detached HEAD)")) + (propertize def-ml + 'help-echo (concat help-echo "\nCurrent branch: " branch))))) + (defun vc-git-dired-state-info (file) "Git-specific version of `vc-dired-state-info'." (let ((git-state (vc-state file))) -- 2.39.5