diff options
| author | Dan Nicolaescu | 2010-01-17 12:36:21 -0800 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-01-17 12:36:21 -0800 |
| commit | 4d0bbcb62adfaa4d29657ee93dfbd7fec2bd51f5 (patch) | |
| tree | 67f16df6087358fbde18e6185142d4f5a888b363 | |
| parent | 607d436922d20758f2af4b70a0c53e73739b5487 (diff) | |
| download | emacs-4d0bbcb62adfaa4d29657ee93dfbd7fec2bd51f5.tar.gz emacs-4d0bbcb62adfaa4d29657ee93dfbd7fec2bd51f5.zip | |
(vc-dir-resynch-file): Update the vc-dir header when
resyncing a directory.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc-dir.el | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6e830684260..fb14b30ac28 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-01-17 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * vc-dir.el (vc-dir-resynch-file): Update the vc-dir header when | ||
| 4 | resyncing a directory. | ||
| 5 | |||
| 1 | 2010-01-17 Stephen Leake <stephen_leake@member.fsf.org> | 6 | 2010-01-17 Stephen Leake <stephen_leake@member.fsf.org> |
| 2 | 7 | ||
| 3 | * progmodes/ada-mode.el: Fix bug#1920, bug#5400. | 8 | * progmodes/ada-mode.el: Fix bug#1920, bug#5400. |
diff --git a/lisp/vc-dir.el b/lisp/vc-dir.el index 575a64c1f80..2f661e8becf 100644 --- a/lisp/vc-dir.el +++ b/lisp/vc-dir.el | |||
| @@ -874,7 +874,10 @@ If it is a file, return the corresponding cons for the file itself." | |||
| 874 | (let ((ddir default-directory)) | 874 | (let ((ddir default-directory)) |
| 875 | (when (vc-string-prefix-p ddir file) | 875 | (when (vc-string-prefix-p ddir file) |
| 876 | (if (file-directory-p file) | 876 | (if (file-directory-p file) |
| 877 | (vc-dir-resync-directory-files file) | 877 | (progn |
| 878 | (vc-dir-resync-directory-files file) | ||
| 879 | (ewoc-set-hf vc-ewoc | ||
| 880 | (vc-dir-headers vc-dir-backend default-directory) "")) | ||
| 878 | (let ((state (vc-dir-recompute-file-state file ddir))) | 881 | (let ((state (vc-dir-recompute-file-state file ddir))) |
| 879 | (vc-dir-update | 882 | (vc-dir-update |
| 880 | (list state) | 883 | (list state) |