diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-06-03 07:56:02 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-06-03 07:56:02 +0000 |
| commit | 8d27bcdf2e758dc6a4868c8fdee65b9a93101b67 (patch) | |
| tree | 2ea72610576caac8f260c9fbdd2b896e2e2eb0f7 /lisp/vc-dispatcher.el | |
| parent | e914c409be7aa66bc4021834a728705cb633c38b (diff) | |
| download | emacs-8d27bcdf2e758dc6a4868c8fdee65b9a93101b67.tar.gz | |
(vc-dir-menu-map-filter): Don't fail if vc-client-mode is not set.
Diffstat (limited to 'lisp/vc-dispatcher.el')
| -rw-r--r-- | lisp/vc-dispatcher.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/vc-dispatcher.el b/lisp/vc-dispatcher.el index f62b3b0744f..dd4d20314ed 100644 --- a/lisp/vc-dispatcher.el +++ b/lisp/vc-dispatcher.el @@ -760,7 +760,10 @@ See `run-hooks'." (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 |