aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2009-01-31 18:38:56 +0000
committerDan Nicolaescu2009-01-31 18:38:56 +0000
commitae42a852883b41352ef47285cf33571c6bed1cc3 (patch)
treec364f52226109b9d182ec4f2e3012eeb4885a83e
parent5d3b5eccbd6ceff13627334726961087d7fbf164 (diff)
downloademacs-ae42a852883b41352ef47285cf33571c6bed1cc3.tar.gz
emacs-ae42a852883b41352ef47285cf33571c6bed1cc3.zip
(vc-dir-mode): Fix docstring.
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/vc-dir.el18
2 files changed, 11 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce946defe5a..407c34cbfcc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -13,6 +13,7 @@
13 (vc-default-dir-printer): 13 (vc-default-dir-printer):
14 (vc-dir-find-file-other-window): Undo previous change, it breaks 14 (vc-dir-find-file-other-window): Undo previous change, it breaks
15 the behavior of mouse-2. 15 the behavior of mouse-2.
16 (vc-dir-mode): Fix docstring.
16 17
17 * vc-svn.el (vc-svn-dir-status): Disable the vc-stay-local-p 18 * vc-svn.el (vc-svn-dir-status): Disable the vc-stay-local-p
18 logic, it makes the makes the normal case too slow. 19 logic, it makes the makes the normal case too slow.
diff --git a/lisp/vc-dir.el b/lisp/vc-dir.el
index 249ceec75f9..1f91ff4d379 100644
--- a/lisp/vc-dir.el
+++ b/lisp/vc-dir.el
@@ -876,13 +876,13 @@ If it is a file, return the corresponding cons for the file itself."
876(define-derived-mode vc-dir-mode special-mode "VC dir" 876(define-derived-mode vc-dir-mode special-mode "VC dir"
877 "Major mode for VC directory buffers. 877 "Major mode for VC directory buffers.
878Marking/Unmarking key bindings and actions: 878Marking/Unmarking key bindings and actions:
879m - marks a file/directory or if the region is active, mark all the files 879m - mark a file/directory
880 in region. 880 - if the region is active, mark all the files in region.
881 Restrictions: - a file cannot be marked if any parent directory is marked 881 Restrictions: - a file cannot be marked if any parent directory is marked
882 - a directory cannot be marked if any child file or 882 - a directory cannot be marked if any child file or
883 directory is marked 883 directory is marked
884u - marks a file/directory or if the region is active, unmark all the files 884u - unmark a file/directory
885 in region. 885 - if the region is active, unmark all the files in region.
886M - if the cursor is on a file: mark all the files with the same state as 886M - if the cursor is on a file: mark all the files with the same state as
887 the current file 887 the current file
888 - if the cursor is on a directory: mark all child files 888 - if the cursor is on a directory: mark all child files
@@ -891,10 +891,12 @@ U - if the cursor is on a file: unmark all the files with the same state
891 as the current file 891 as the current file
892 - if the cursor is on a directory: unmark all child files 892 - if the cursor is on a directory: unmark all child files
893 - with a prefix argument: unmark all files 893 - with a prefix argument: unmark all files
894mouse-2 - toggles the mark state
894 895
895VC commands 896VC commands
896VC commands in the `C-x v' can be used, they act on the marked 897VC commands in the `C-x v' prefix can be used.
897entries, or on the current entry if nothing is marked. 898VC commands act on the marked entries. If nothing is marked, VC
899commands act on the current entry.
898 900
899Search & Replace 901Search & Replace
900S - searches the marked files 902S - searches the marked files
@@ -903,8 +905,8 @@ M-s a C-s - does an isearch on the marked files
903M-s a C-M-s - does a regexp isearch on the marked files 905M-s a C-M-s - does a regexp isearch on the marked files
904If nothing is marked, these commands act on the current entry. 906If nothing is marked, these commands act on the current entry.
905When a directory is current or marked, the Search & Replace 907When a directory is current or marked, the Search & Replace
906commands act on the files in those directories displayed in the 908commands act on the child files of that directory that are displayed in
907*vc-dir* buffer. 909the *vc-dir* buffer.
908 910
909\\{vc-dir-mode-map}" 911\\{vc-dir-mode-map}"
910 (set (make-local-variable 'vc-dir-backend) use-vc-backend) 912 (set (make-local-variable 'vc-dir-backend) use-vc-backend)