(vc-menu-map-filter): Be more careful when finding

the current backend.

2 files changed, 11 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb8939ad470..94c3ee908ca 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-29  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * vc-hooks.el (vc-menu-map-filter): Be more careful when finding
+        the current backend.
+
 2008-03-29  Glenn Morris  <rgm@gnu.org>
 
         * calendar/calendar.el (diary-file, american-date-diary-pattern)
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index c033b6e8fbc..893b16db601 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -1064,8 +1064,12 @@ Used in `find-file-not-found-functions'."
   (if (and (symbolp orig-binding) (fboundp orig-binding))
       (setq orig-binding (indirect-function orig-binding)))
   (let ((ext-binding
-         (if vc-mode (vc-call-backend (vc-backend buffer-file-name)
-                                      'extra-menu))))
+         (when vc-mode
+           (vc-call-backend 
+            (if buffer-file-name
+                (vc-backend buffer-file-name)
+              (vc-responsible-backend default-directory))
+            'extra-menu))))
     ;; Give the VC backend a chance to add menu entries
     ;; specific for that backend.
     (if (null ext-binding)