[Emacs-diffs] Changes to emacs/lisp/vc.el,v

[Eric S. Raymond]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Eric S. Raymond <esr>   08/05/09 20:07:01

Index: vc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc.el,v
retrieving revision 1.649
retrieving revision 1.650
diff -u -b -r1.649 -r1.650
--- vc.el       9 May 2008 18:59:45 -0000       1.649
+++ vc.el       9 May 2008 20:07:01 -0000       1.650
@@ -2013,12 +2013,14 @@
       ;; 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