From: Dan Nicolaescu Date: Sat, 10 May 2008 03:55:00 +0000 (+0000) Subject: (vc-prefix-map): Remove duplicate binding. X-Git-Tag: emacs-pretest-23.0.90~5653 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0108dbd656861a5611cc2d786b70642a7c636898;p=emacs.git (vc-prefix-map): Remove duplicate binding. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cbb2eb4dc47..f01d7dc292b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,11 @@ +2008-05-10 Dan Nicolaescu + + * vc-hooks.el (vc-prefix-map): Remove duplicate binding. + 2008-05-09 Eric S. Raymond - * 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 --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index be1e9f91fb3..e8c04684619 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el @@ -995,7 +995,6 @@ 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-dir) map)) (fset 'vc-prefix-map vc-prefix-map) (define-key global-map "\C-xv" 'vc-prefix-map)