aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasatake YAMATO <[email protected]>2007-06-15 18:50:19 +0000
committerMasatake YAMATO <[email protected]>2007-06-15 18:50:19 +0000
commit1bd8df7efa018cdf5342ca6a0a478a14ebf8e773 (patch)
treeb3c42eacf073371918b54260367d3ce39028c256
parent511ab56a1ce5a4a2cea73953e755404f0ed32b65 (diff)
* vc.el (vc-dired-hook): check the backend returned from `vc-responsible-backend' can really handle `subdir'.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc.el4
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7013bdaf3c..b67b406c60 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-15 Masatake YAMATO <[email protected]>
+
+ * vc.el (vc-dired-hook): check the backend returned from
+ `vc-responsible-backend' can really handle `subdir'.
+
2007-06-15 Chong Yidong <[email protected]>
* wid-edit.el (widget-add-documentation-string-button): Fix
diff --git a/lisp/vc.el b/lisp/vc.el
index 7d9844f3bc..d5c53a15a7 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