VC directory bindings are noew documented.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fb87eef929addc80a8b99436a4f289f2e5d277d9..20e02ce4c78e4fd3b8c55233b83143243bfdad76 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2008-05-09  Eric S. Raymond  <esr@snark.thyrsus.com>
 
+       * vc.el (vc-dir), vc-hooks.el: Tweak the VC directory bindings.
+       These are now documented in the manual.
        * vc-dispatcher.el (vc-dir-update, vc-dir-parent-marked-p, 
        vc-dir-children-marked-p): Remove the vc-dir-insert-directories global.
 

diff --git a/lisp/vc-dispatcher.el b/lisp/vc-dispatcher.el
index 64845b9961481ba9f72d9044daf07dbb7c6ef5a2..de034116da868b53cf54dfa92755de12286dc2e6 100644 (file)
--- a/lisp/vc-dispatcher.el
+++ b/lisp/vc-dispatcher.el
@@ -119,8 +119,6 @@
 ;;
 ;; - add commands to move to the prev/next directory in vc-dir.
 ;;
-;; - document vc-dir in the manual.
-;;
 ;; - vc-dir-menu-map-filter hook call needs to be moved to vc.el.
 ;;
 

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 926027bdff38da454c111a61239f3122d8ebec9c..be1e9f91fb38388484e6cc435c9891b73e0b6919 100644 (file)
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -995,8 +995,7 @@ Used in `find-file-not-found-functions'."
     (define-key map "+" 'vc-update)
     (define-key map "=" 'vc-diff)
     (define-key map "~" 'vc-revision-other-window)
-    ;; `vc-dir' is a not-quite-ready replacement for `vc-directory'
-    ;; (define-key map "?" 'vc-dir)
+    (define-key map "?" 'vc-dir)
     map))
 (fset 'vc-prefix-map vc-prefix-map)
 (define-key global-map "\C-xv" 'vc-prefix-map)

diff --git a/lisp/vc.el b/lisp/vc.el
index 7e7240fcdd7c34a63ecce8f573028e794953d197..2a46d1387314e8f2bdf1ba5519b906be46870ba4 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -2013,12 +2013,14 @@ outside of VC) and one wants to do some operation on it."
       ;; FIXME: Make a derived-mode instead.
       ;; Add VC-specific keybindings
       (let ((map (current-local-map)))
+       (define-key map "v" 'vc-diff) ;; C-x v v
        (define-key map "=" 'vc-diff) ;; C-x v =
-       (define-key map "a" 'vc-dir-register)
+       (define-key map "i" 'vc-dir-register)   ;; C-x v i
        (define-key map "+" 'vc-update) ;; C-x v +
-       (define-key map "R" 'vc-revert) ;; u is taken by dispatcher unmark.
-       (define-key map "A" 'vc-annotate) ;; g is taken by dispatcher referesh
        (define-key map "l" 'vc-print-log) ;; C-x v l
+       ;; More confusing than helpful, probably
+       ;(define-key map "R" 'vc-revert) ;; u is taken by dispatcher unmark.
+       ;(define-key map "A" 'vc-annotate) ;; g is taken by dispatcher refresh
        (define-key map "x" 'vc-dir-hide-up-to-date))
       )
     ;; FIXME: Needs to alter a buffer-local map, otherwise clients may clash