revert the `vc-status' keybindings

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8cd7ea0028735b229210c80f2d6158b5091a6c94..0304dd5ea27ebce2a76fff23946a7a21bf8a99f7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,6 @@
 2008-02-06  Sam Steingold  <sds@gnu.org>
 
-       * 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  <monnier@iro.umontreal.ca>
 

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index a4f5bcc3fe63c1950a9e95f9bdf4ffa81b7222ff..945568ebc935d3b25bca4886f8814c8edbc13570 100644 (file)
--- 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))