diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc.el | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c2f40af489f..7c83f9e1f8c 100644 --- 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 5dc91bf14f8..2775fd6a758 100644 --- 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))) |