summaryrefslogtreecommitdiff
path: root/lisp/vc-dir.el
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2009-07-24 05:41:17 +0000
committerDan Nicolaescu <dann@ics.uci.edu>2009-07-24 05:41:17 +0000
commitba83b7b62f12b0305585261f7b08bf1a699aa86b (patch)
treeddc634cd056561c48a0f49be9d552da41f4574a6 /lisp/vc-dir.el
parent1d2faf9803bcd171fdb1d305b1b8f266c445b9dd (diff)
* vc-dispatcher.el (vc-resynch-buffers-in-directory): Make sure
the buffer we try to sync is current when calling vc-resynch-buffer. * vc-dir.el (vc-dir-resynch-file): Make sure vc-dir-update does not show up to date files.
Diffstat (limited to 'lisp/vc-dir.el')
-rw-r--r--lisp/vc-dir.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/vc-dir.el b/lisp/vc-dir.el
index 4316caeade..2c1138f858 100644
--- a/lisp/vc-dir.el
+++ b/lisp/vc-dir.el
@@ -866,9 +866,10 @@ If it is a file, return the corresponding cons for the file itself."
(when (vc-string-prefix-p ddir file)
(if (file-directory-p file)
(vc-dir-resync-directory-files file)
- (vc-dir-update
- (list (vc-dir-recompute-file-state file ddir))
- status-buf)))))))
+ (let ((state (vc-dir-recompute-file-state file ddir)))
+ (vc-dir-update
+ (list state)
+ status-buf (eq (cadr state) 'up-to-date)))))))))
;; We didn't find any vc-dir buffers, remove the hook, it is
;; not needed.
(unless found-vc-dir-buf