summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorSam Steingold <sds@gnu.org>2008-04-30 19:03:54 +0000
committerSam Steingold <sds@gnu.org>2008-04-30 19:03:54 +0000
commit97e089f64dd3d339c926bcd8dbe79ecfaf26f350 (patch)
tree64ed57c782fd6beb0cb4b82f846c098f64f2a8c0 /lisp
parent775237d3a1bdf71ada8505b9d89a11fe17f71ceb (diff)
downloademacs-97e089f64dd3d339c926bcd8dbe79ecfaf26f350.tar.gz
(vc-dir-mode-map): Bind "r" to vc-dir-delete-file, like in PCL-CVS.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc.el8
2 files changed, 6 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3cedeca41d5..e22f4cb2ba7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,7 @@
2008-04-30 Sam Steingold <sds@gnu.org>
- * vc.el (vc-dir-mode-map): Bind "d" to vc-dir-delete-file.
- (vc-dir-delete-file): Add.
+ * vc.el (vc-dir-delete-file): Add.
+ (vc-dir-mode-map): Bind "r" to vc-dir-delete-file, like in PCL-CVS.
(vc-delete-file): Do not barf when the file has been already deleted.
2008-04-30 Dan Nicolaescu <dann@ics.uci.edu>
diff --git a/lisp/vc.el b/lisp/vc.el
index 764e52f7066..d6536e8a3ee 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -2985,7 +2985,7 @@ specific headers."
(define-key map "x" 'vc-dir-hide-up-to-date)
(define-key map "q" 'quit-window)
(define-key map "g" 'vc-dir-refresh)
- (define-key map "d" 'vc-dir-delete-file)
+ (define-key map "r" 'vc-dir-delete-file) ; like in PCL-CVS
(define-key map "\C-c\C-c" 'vc-dir-kill-dir-status-process)
;; Does not work unless mouse sets point. Functions like vc-dir-find-file
;; need to find the file from the mouse position, not `point'.
@@ -3054,12 +3054,12 @@ specific headers."
(defun vc-dir-mode ()
"Major mode for showing the VC status for a directory.
Marking/Unmarking key bindings and actions:
-m - marks a file/directory or ff the region is active, mark all the files
+m - marks a file/directory or ff the region is active, mark all the files
in region.
Restrictions: - a file cannot be marked if any parent directory is marked
- - a directory cannot be marked if any child file or
+ - a directory cannot be marked if any child file or
directory is marked
-u - marks a file/directory or if the region is active, unmark all the files
+u - marks a file/directory or if the region is active, unmark all the files
in region.
M - if the cursor is on a file: mark all the files with the same VC state as
the current file