Mercurial > emacs
changeset 95511:8d41ea93731c
(vc-dir-menu-map-filter): Don't fail if vc-client-mode is not set.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 03 Jun 2008 07:56:02 +0000 |
| parents | 6a5a957d73c9 |
| children | 29ddd334019a |
| files | lisp/ChangeLog lisp/vc-dispatcher.el |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Jun 03 07:46:36 2008 +0000 +++ b/lisp/ChangeLog Tue Jun 03 07:56:02 2008 +0000 @@ -1,5 +1,8 @@ 2008-06-03 Stefan Monnier <monnier@iro.umontreal.ca> + * vc-dispatcher.el (vc-dir-menu-map-filter): Don't fail if + vc-client-mode is not set. + * image-mode.el (image-mode-map): Suppress key map and bind `q'. * doc-view.el (doc-view-mode-map): Inherit from image-mode-map.
--- a/lisp/vc-dispatcher.el Tue Jun 03 07:46:36 2008 +0000 +++ b/lisp/vc-dispatcher.el Tue Jun 03 07:56:02 2008 +0000 @@ -760,7 +760,10 @@ (when (and (symbolp orig-binding) (fboundp orig-binding)) (setq orig-binding (indirect-function orig-binding))) (let ((ext-binding - (funcall (vc-client-object->extra-menu vc-client-mode)))) + ;; This may be executed at load-time for tool-bar-local-item-from-menu + ;; but at that time vc-client-mode is not known (or even bound) yet. + (when (and (boundp 'vc-client-mode) vc-client-mode) + (funcall (vc-client-object->extra-menu vc-client-mode))))) (if (null ext-binding) orig-binding (append orig-binding