(vc-dir-mode-map): Bind "r" to vc-dir-delete-file, like in PCL-CVS.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3cedeca41d5ad78586e243ef126839b58fcd990d..e22f4cb2ba71733f35f3256183db0ec761140f41 100644 (file)
--- 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 764e52f7066204d4ad296d98dfd7bdf435e5ee62..d6536e8a3eeba4200cce0f5ef7956cc1caa0e9ad 100644 (file)
--- 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