2 files changed, 8 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7013bdaf3cd..b67b406c600 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-15  Masatake YAMATO  <jet@gyve.org>
+
+        * vc.el (vc-dired-hook): check the backend returned from 
+        `vc-responsible-backend' can really handle `subdir'.
+
 2007-06-15  Chong Yidong  <cyd@stupidchicken.com>
 
         * wid-edit.el (widget-add-documentation-string-button): Fix
diff --git a/lisp/vc.el b/lisp/vc.el
index 7d9844f3bc9..d5c53a15a76 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -2216,7 +2216,9 @@ Called by dired after any portion of a vc-dired buffer has been read in."
         ;; if the backend supports it, get the state
         ;; of all files in this directory at once
         (let ((backend (vc-responsible-backend subdir)))
-          (if (vc-find-backend-function backend 'dir-state)
+          ;; check `backend' can really handle `subdir'.
+          (if (and (vc-call-backend backend 'responsible-p subdir)
+                   (vc-find-backend-function backend 'dir-state))
               (vc-call-backend backend 'dir-state subdir)))
         (forward-line 1)
         ;; erase (but don't remove) the "total" line