diff options
| author | Dan Nicolaescu | 2007-11-23 15:17:25 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2007-11-23 15:17:25 +0000 |
| commit | d24182bbae78bc58d31c96faf7ad49c165c6b6ef (patch) | |
| tree | f039196649e1ecd0fb73f0d9cd7952f8ab9886ce | |
| parent | 4d77fc8ece1e07b65407d7a2b323149f971a6370 (diff) | |
| download | emacs-d24182bbae78bc58d31c96faf7ad49c165c6b6ef.tar.gz emacs-d24182bbae78bc58d31c96faf7ad49c165c6b6ef.zip | |
(vc-deduce-fileset): Also look for a fileset in the parent
buffer if the parent buffer is in vc-dired-mode.
| -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 @@ | |||
| 1 | 2007-11-23 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * vc.el (vc-deduce-fileset): Also look for a fileset in the parent | ||
| 4 | buffer if the parent buffer is in vc-dired-mode. | ||
| 5 | |||
| 1 | 2007-11-23 Mark A. Hershberger <mah@everybody.org> | 6 | 2007-11-23 Mark A. Hershberger <mah@everybody.org> |
| 2 | 7 | ||
| 3 | * nxml: Initial merge of nxml. Kept nxml/char-name subdir for | 8 | * 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." | |||
| 1267 | marked)) | 1267 | marked)) |
| 1268 | ((vc-backend buffer-file-name) | 1268 | ((vc-backend buffer-file-name) |
| 1269 | (list buffer-file-name)) | 1269 | (list buffer-file-name)) |
| 1270 | ((and vc-parent-buffer (buffer-file-name vc-parent-buffer)) | 1270 | ((and vc-parent-buffer (or (buffer-file-name vc-parent-buffer) |
| 1271 | (with-current-buffer vc-parent-buffer | ||
| 1272 | vc-dired-mode))) | ||
| 1271 | (progn | 1273 | (progn |
| 1272 | (set-buffer vc-parent-buffer) | 1274 | (set-buffer vc-parent-buffer) |
| 1273 | (vc-deduce-fileset))) | 1275 | (vc-deduce-fileset))) |