(vc-prefix-key): Remove (undo 2008-02-06 patch).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4ee7ee0e2ad3f79ab6e59f59f3df2306c0c09697..1b9b95dc8a8eb6ad497da6afa3f9a0db346a25af 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-11  Sam Steingold  <sds@gnu.org>
+
+       * vc-hooks.el (vc-prefix-key): Remove (undo 2008-02-06 patch).
+
 2008-02-11  Glenn Morris  <rgm@gnu.org>
 
        * startup.el (emacs-startup-time): New variable.
@@ -2317,7 +2321,7 @@
 
 2008-02-01  Dave Love  <fx@gnu.org>
 
-       * international/characters.el: Make \e,_/\e(B and \e,A\7f\e(B a case pair.
+       * international/characters.el: Make \e$,1!8\e(B and \e,A\7f\e(B a case pair.
 
 2008-02-01  Kenichi Handa  <handa@etl.go.jp>
 

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 945568ebc935d3b25bca4886f8814c8edbc13570..4f1858a21083f66e770944c7fc7d849a0632a44c 100644 (file)
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -972,14 +972,7 @@ Used in `find-file-not-found-functions'."
     ;; (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."
-  :set (lambda (symbol prefix)  ; symbol == vc-prefix-key
-         (define-key global-map prefix 'vc-prefix-map) ; install new prefix
-         (when (boundp 'vc-prefix-key) ; disable the previous prefix
-           (define-key global-map vc-prefix-key nil))
-         (set symbol prefix))   ; save the new prefix
-  :version "23.1"
-  :group 'vc)
+(define-key global-map "\C-xv" 'vc-prefix-map)
 
 (defvar vc-menu-map
   (let ((map (make-sparse-keymap "Version Control")))