From dce13547790f2d3422597926b6aaf49d56bddaf7 Mon Sep 17 00:00:00 2001 From: Sam Steingold Date: Wed, 6 Feb 2008 19:06:34 +0000 Subject: [PATCH] revert the `vc-status' keybindings --- lisp/ChangeLog | 4 +--- lisp/vc-hooks.el | 6 ++++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8cd7ea00287..0304dd5ea27 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,8 +1,6 @@ 2008-02-06 Sam Steingold - * vc-hooks.el (vc-prefix-map): Bind `vc-status' to "?". - (vc-prefix-key): New user-customizable variable. - (vc-menu-map): Add `vc-status'. + * vc-hooks.el (vc-prefix-key): New user-customizable variable. 2008-02-06 Stefan Monnier diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index a4f5bcc3fe6..945568ebc93 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el @@ -968,7 +968,8 @@ Used in `find-file-not-found-functions'." (define-key map "+" 'vc-update) (define-key map "=" 'vc-diff) (define-key map "~" 'vc-revision-other-window) - (define-key map "?" 'vc-status) + ;; `vc-status' is a not-quite-ready replacement for `vc-directory' + ;; (define-key map "?" 'vc-status) map)) (fset 'vc-prefix-map vc-prefix-map) (defcustom vc-prefix-key "\C-xv" "*The prefix for the VC bindings." @@ -989,7 +990,8 @@ Used in `find-file-not-found-functions'." (define-key map [vc-create-snapshot] '("Create Snapshot" . vc-create-snapshot)) (define-key map [vc-directory] '("VC Directory Listing" . vc-directory)) - (define-key map [vc-status] '("VC Status" . vc-status)) + ;; `vc-status' is a not-quite-ready replacement for `vc-directory' + ;; (define-key map [vc-status] '("VC Status" . vc-status)) (define-key map [separator1] '("----")) (define-key map [vc-annotate] '("Annotate" . vc-annotate)) (define-key map [vc-rename-file] '("Rename File" . vc-rename-file)) -- 2.11.4.GIT