Mercurial > emacs
changeset 86370:36ff364fc708
(vc-deduce-fileset): Also look for a fileset in the parent
buffer if the parent buffer is in vc-dired-mode.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Fri, 23 Nov 2007 15:17:25 +0000 |
| parents | 849833927621 |
| children | dac032dc601a |
| files | lisp/ChangeLog lisp/vc.el |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Nov 23 14:17:38 2007 +0000 +++ b/lisp/ChangeLog Fri Nov 23 15:17:25 2007 +0000 @@ -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
--- a/lisp/vc.el Fri Nov 23 14:17:38 2007 +0000 +++ b/lisp/vc.el Fri Nov 23 15:17:25 2007 +0000 @@ -1267,7 +1267,9 @@ 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)))