summaryrefslogtreecommitdiff
path: root/doc/emacs
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2008-08-06 03:45:04 +0000
committerDan Nicolaescu <dann@ics.uci.edu>2008-08-06 03:45:04 +0000
commit5c915c024c57d386c0232870704a41bc880e74c7 (patch)
tree5a84c360c98abbeafcbbafa605559de703ef2d54 /doc/emacs
parentcd222e44e07d5b431a81ae8515a211f7e420de9f (diff)
downloademacs-5c915c024c57d386c0232870704a41bc880e74c7.tar.gz
(VC Directory Mode): Talk about multiple VC systems.
Diffstat (limited to 'doc/emacs')
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/vc1-xtra.texi4
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index f99af4fc5b3..b869b2eed19 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-06 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * vc1-xtra.texi (VC Directory Mode): Talk about multiple VC systems.
+
2008-08-05 Nick Roberts <nickrob@snap.net.nz>
* vc1-xtra.texi (VC Directory Mode): Fix typo.
diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi
index 57c7cabe219..7ef34a3d4c5 100644
--- a/doc/emacs/vc1-xtra.texi
+++ b/doc/emacs/vc1-xtra.texi
@@ -34,6 +34,10 @@ run will always be shown as @file{./}.) There is an exception to this
rule: if VC mode detects that a file changed to up-to-date state since
you last looked at it, that state will be shown.
+If a directory uses more that one VC systems, the VC system to use for
+the vc-dir command can be chosen with a prefix argument,
+i.e. @kbd{C-u C-x v d}.
+
The line for an individual file will show the version control state of
the file. Under RCS and SCCS, the name of the user locking the file
is shown; under CVS, an abbreviated version of the @samp{cvs status}