(vc-deduce-fileset): Also look for a fileset in the parent

buffer if the parent buffer is in vc-dired-mode.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c2f40af489fcd7168a76cd483c6ed91764751fc0..7c83f9e1f8c119c0638c6aa4f9a34c05c876a324 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-23  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * vc.el (vc-deduce-fileset): Also look for a fileset in the parent
+       buffer if the parent buffer is in vc-dired-mode.
+
 2007-11-23  Mark A. Hershberger  <mah@everybody.org>
 
        * nxml: Initial merge of nxml.  Kept nxml/char-name subdir for

diff --git a/lisp/vc.el b/lisp/vc.el
index 5dc91bf14f85e72c623c095590b6d6f676cc15b1..2775fd6a75873876c13384e841f9db6b6ccbde53 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1267,7 +1267,9 @@ Otherwise, throw an error."
           marked))
        ((vc-backend buffer-file-name)
         (list buffer-file-name))
-       ((and vc-parent-buffer (buffer-file-name vc-parent-buffer))
+       ((and vc-parent-buffer (or (buffer-file-name vc-parent-buffer)
+                                  (with-current-buffer vc-parent-buffer
+                                    vc-dired-mode)))
         (progn
           (set-buffer vc-parent-buffer)
           (vc-deduce-fileset)))