(vc-dir-menu-map-filter): Don't fail if vc-client-mode is not set.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 63496779e63191a04a232fe52dd03e54a50402fe..ec5be377aa754abd1baeab9b2ef2773cc8e51a67 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.
 

diff --git a/lisp/vc-dispatcher.el b/lisp/vc-dispatcher.el
index f62b3b0744fcb58ca627eee067df24909555b5a0..dd4d20314ed36746f1e0059a7e43df7a96f2f31e 100644 (file)
--- 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