aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Rumney2007-08-22 22:40:18 +0000
committerJason Rumney2007-08-22 22:40:18 +0000
commit4d2f172bd35271ba5ca3e3e0f9a2087e14ac27fd (patch)
treef480119ff46980bde3d492c825b5d549e36136ab
parentd1d45b92cc43f06b7b65202675585e49cf52a3e3 (diff)
downloademacs-4d2f172bd35271ba5ca3e3e0f9a2087e14ac27fd.tar.gz
emacs-4d2f172bd35271ba5ca3e3e0f9a2087e14ac27fd.zip
(vc-menu-map-filter): Reapply 2007-08-06 bugfix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc-hooks.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2384df3600f..988963ac75d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12007-08-22 Jason Rumney <jasonr@gnu.org>
2
3 * vc-hooks.el (vc-menu-map-filter): Reapply 2007-08-06 bugfix.
4
12007-08-22 Chong Yidong <cyd@stupidchicken.com> 52007-08-22 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * image-mode.el (image-minor-mode): Use image-mode-text-map. 7 * image-mode.el (image-minor-mode): Use image-mode-text-map.
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index c206d5e953c..7e830d7d168 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -964,7 +964,8 @@ Used in `find-file-not-found-functions'."
964 (if (and (symbolp orig-binding) (fboundp orig-binding)) 964 (if (and (symbolp orig-binding) (fboundp orig-binding))
965 (setq orig-binding (indirect-function orig-binding))) 965 (setq orig-binding (indirect-function orig-binding)))
966 (let ((ext-binding 966 (let ((ext-binding
967 (if vc-mode (vc-call extra-menu buffer-file-name)))) 967 (if vc-mode (vc-call-backend (vc-backend buffer-file-name)
968 'extra-menu))))
968 ;; Give the VC backend a chance to add menu entries 969 ;; Give the VC backend a chance to add menu entries
969 ;; specific for that backend. 970 ;; specific for that backend.
970 (if (null ext-binding) 971 (if (null ext-binding)