summaryrefslogtreecommitdiff
path: root/lisp/vc/vc-hooks.el
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2010-09-30 14:44:25 +0200
committerEli Zaretskii <eliz@gnu.org>2010-09-30 14:44:25 +0200
commitcad90f3b7ad1fafdb09d1bcd3fe4908f94cb3943 (patch)
tree8f26c612d9ad2ecde3430812dcc2ab8f7f360bd6 /lisp/vc/vc-hooks.el
parent743595bc3405fc3d063a5089ea54fcd33b0812ad (diff)
downloademacs-cad90f3b7ad1fafdb09d1bcd3fe4908f94cb3943.tar.gz
Fix documentation of VC status indicator in mode line.
lisp/vc/vc-hooks.el (vc-default-mode-line-string): Doc fix. doc/emacs/maintaining.texi (VC Mode Line): Mention all the possible VC status indicator characters.
Diffstat (limited to 'lisp/vc/vc-hooks.el')
-rw-r--r--lisp/vc/vc-hooks.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 91e9b8e3cd3..5007231d960 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -815,6 +815,9 @@ Format:
\"BACKEND-REV\" if the file is up-to-date
\"BACKEND:REV\" if the file is edited (or locked by the calling user)
\"BACKEND:LOCKER:REV\" if the file is locked by somebody else
+ \"BACKEND@REV\" if the file was locally added
+ \"BACKEND!REV\" if the file contains conflicts or was removed
+ \"BACKEND?REV\" if the file is under VC, but is missing
This function assumes that the file is registered."
(let* ((backend-name (symbol-name backend))