(vc-dir-mode-map): Don't bind "r".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5c725b9eef26f071ba3ac442ec252c75391ae31d..4675f3ff710c0ac4378c7e6e5c4f56a42763ba9b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-01  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * vc.el (vc-dir-mode-map): Don't bind "r".
+
 2008-05-01  John Paul Wallington  <jpw@pobox.com>
 
        * ibuffer.el (ibuffer-last-sorting-mode): New variable.

diff --git a/lisp/vc.el b/lisp/vc.el
index d6536e8a3eeba4200cce0f5ef7956cc1caa0e9ad..f13f4bd9d0046ad40d3440bfa7e018f907ce65e6 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -672,6 +672,9 @@
 ;; - vc-cvs-delete-file should not do a "cvs commit" immediately after
 ;;   removing the file.
 ;;
+;; - vc-delete-file should check if the file contains non-checked in
+;;   changes and warn about losing them.
+;;
 ;; - vc-create-snapshot and vc-retrieve-snapshot should update the
 ;;   buffers that might be visiting the affected files.
 
@@ -2985,7 +2988,6 @@ 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 "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'.