# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1210391700 0
# Node ID 8dbc13404a475ff0e43239ed4ef287191622c785
# Parent  e6db9ee945b876393224906cb78757b28ba59e59
(vc-prefix-map): Remove duplicate binding.

diff -r e6db9ee945b8 -r 8dbc13404a47 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri May 09 23:48:10 2008 +0000
+++ b/lisp/ChangeLog	Sat May 10 03:55:00 2008 +0000
@@ -1,6 +1,11 @@
+2008-05-10  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* vc-hooks.el (vc-prefix-map): Remove duplicate binding.
+
 2008-05-09  Eric S. Raymond  <esr@snark.thyrsus.com>
 
-	* vc.el (vc-dir), vc-hooks.el: Tweak the VC directory bindings.
+	* 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.
@@ -18,8 +23,8 @@
 
 	* vc-sccs.el, vc.svn.el, vc-git.el, vc-hg.el, vc-mtn.el: Remove
 	stub implementations of, and references to, wash-log.
-	* vc-rcs.el (vc-rcs-comment-history), 
-	vc-cvs.el (vc-cvs-comment-history):
+	* vc-rcs.el (vc-rcs-comment-history):
+	* vc-cvs.el (vc-cvs-comment-history):
 	Inline the code that used to be wash-log.
 
 	* vc-sccs.el (vc-sccs-checkin, vc-sccs-checkout, vc-sccs-rollback)
diff -r e6db9ee945b8 -r 8dbc13404a47 lisp/vc-hooks.el
--- a/lisp/vc-hooks.el	Fri May 09 23:48:10 2008 +0000
+++ b/lisp/vc-hooks.el	Sat May 10 03:55:00 2008 +0000
@@ -995,7 +995,6 @@
     (define-key map "+" 'vc-update)
     (define-key map "=" 'vc-diff)
     (define-key map "~" 'vc-revision-other-window)
-    (define-key map "?" 'vc-dir)
     map))
 (fset 'vc-prefix-map vc-prefix-map)
 (define-key global-map "\C-xv" 'vc-prefix-map)