aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc-dir.el5
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 @@
12010-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
12010-01-17 Stephen Leake <stephen_leake@member.fsf.org> 62010-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)