# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1285850665 -7200
# Node ID c05f92a4d8346a1ae70f72523eb499fef15a8813
# Parent  07e31ac3910e89ef070965337293c43f05871741
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.

diff -r 07e31ac3910e -r c05f92a4d834 doc/emacs/ChangeLog
--- a/doc/emacs/ChangeLog	Thu Sep 30 10:25:45 2010 +0000
+++ b/doc/emacs/ChangeLog	Thu Sep 30 14:44:25 2010 +0200
@@ -1,3 +1,8 @@
+2010-09-30  Eli Zaretskii  <eliz@gnu.org>
+
+	* maintaining.texi (VC Mode Line): Mention all the possible VC status
+	indicator characters.
+
 2010-09-29  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in (top_srcdir): Remove unused variable.
diff -r 07e31ac3910e -r c05f92a4d834 doc/emacs/maintaining.texi
--- a/doc/emacs/maintaining.texi	Thu Sep 30 10:25:45 2010 +0000
+++ b/doc/emacs/maintaining.texi	Thu Sep 30 14:44:25 2010 +0200
@@ -362,10 +362,16 @@
 
 @node VC Mode Line
 @subsection Version Control and the Mode Line
+@cindex VC, mode line indicator
 
   When you visit a file that is under version control, Emacs indicates
-this on the mode line.  For example, @samp{RCS-1.3} says that RCS is
-used for that file, and the current version is 1.3.
+this on the mode line.  For example, @samp{RCS-1.3} says that the RCS
+back end is used for that file, and the current version of the file is
+1.3.
+
+  The first part of the VC mode-line indicator is the name of the back
+end: @samp{RCS}, @samp{CVS}, @samp{Bzr}, etc.  The back-end name is
+followed by a single character and the version of the file.
 
   The character between the back-end name and the revision ID
 indicates the version control status of the file.  @samp{-} means that
@@ -373,6 +379,12 @@
 locking is not in use).  @samp{:} indicates that the file is locked, or
 that it is modified.  If the file is locked by some other user (for
 instance, @samp{jim}), that is displayed as @samp{RCS:jim:1.3}.
+@samp{@@} means that the file was locally added, but not yet committed
+to the master repository.  @samp{!} indicates that the file contains
+conflicts as result of a recent merge operation (@pxref{Merging}), or
+that the file was removed from the version control.  Finally, @samp{?}
+means that the file is under version control, but is missing from the
+working tree.
 
   On a graphical display, you can move the mouse over this mode line
 indicator to pop up a ``tool-tip'', which displays a more verbose
diff -r 07e31ac3910e -r c05f92a4d834 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Sep 30 10:25:45 2010 +0000
+++ b/lisp/ChangeLog	Thu Sep 30 14:44:25 2010 +0200
@@ -1,3 +1,7 @@
+2010-09-30  Eli Zaretskii  <eliz@gnu.org>
+
+	* vc/vc-hooks.el (vc-default-mode-line-string): Doc fix.
+
 2010-09-30  Juanma Barranquero  <lekktu@gmail.com>
 
 	* server.el (server-start): Don't write pid to the authentication file.
diff -r 07e31ac3910e -r c05f92a4d834 lisp/vc/vc-hooks.el
--- a/lisp/vc/vc-hooks.el	Thu Sep 30 10:25:45 2010 +0000
+++ b/lisp/vc/vc-hooks.el	Thu Sep 30 14:44:25 2010 +0200
@@ -815,6 +815,9 @@
   \"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))