Mercurial > emacs
changeset 94819:aa24238f3274
VC directory bindings are noew documented.
| author | Eric S. Raymond <esr@snark.thyrsus.com> |
|---|---|
| date | Fri, 09 May 2008 20:07:01 +0000 |
| parents | 8eb267268480 |
| children | 5b364ab2654b |
| files | lisp/ChangeLog lisp/vc-dispatcher.el lisp/vc-hooks.el lisp/vc.el |
| diffstat | 4 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri May 09 20:03:27 2008 +0000 +++ b/lisp/ChangeLog Fri May 09 20:07:01 2008 +0000 @@ -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.
--- a/lisp/vc-dispatcher.el Fri May 09 20:03:27 2008 +0000 +++ b/lisp/vc-dispatcher.el Fri May 09 20:07:01 2008 +0000 @@ -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. ;;
--- a/lisp/vc-hooks.el Fri May 09 20:03:27 2008 +0000 +++ b/lisp/vc-hooks.el Fri May 09 20:07:01 2008 +0000 @@ -995,8 +995,7 @@ (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)
--- a/lisp/vc.el Fri May 09 20:03:27 2008 +0000 +++ b/lisp/vc.el Fri May 09 20:07:01 2008 +0000 @@ -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