aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2008-04-14 16:36:32 +0000
committerStefan Monnier2008-04-14 16:36:32 +0000
commit010d97291d2280b22663f8895cf60702bb75476a (patch)
tree0a59f72e61c8bad7e8ff667fd9b1d76607ea0ce9
parentfc6dcd067d75fd45427bb320596f8c5a3baf893f (diff)
downloademacs-010d97291d2280b22663f8895cf60702bb75476a.tar.gz
emacs-010d97291d2280b22663f8895cf60702bb75476a.zip
(vc-status-update): Set needs-update.
(vc-status-refresh): η-reduce.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/vc.el10
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 97651c65390..ed590f9c3e6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,8 @@
12008-04-14 Stefan Monnier <monnier@iro.umontreal.ca> 12008-04-14 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * vc.el (vc-status-update): Fix typo. 3 * vc.el (vc-status-update): Fix typo.
4 (vc-status-update): Set needs-update.
5 (vc-status-refresh): η-reduce.
4 6
52008-04-14 Tassilo Horn <tassilo@member.fsf.org> 72008-04-14 Tassilo Horn <tassilo@member.fsf.org>
6 8
diff --git a/lisp/vc.el b/lisp/vc.el
index b54523fa48f..42d7b0d9d7e 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -3038,6 +3038,7 @@ If NOINSERT, ignore elements on ENTRIES which are not in the ewoc."
3038 (t 3038 (t
3039 (setf (vc-status-fileinfo->state (ewoc-data node)) (nth 1 entry)) 3039 (setf (vc-status-fileinfo->state (ewoc-data node)) (nth 1 entry))
3040 (setf (vc-status-fileinfo->extra (ewoc-data node)) (nth 2 entry)) 3040 (setf (vc-status-fileinfo->extra (ewoc-data node)) (nth 2 entry))
3041 (setf (vc-status-fileinfo->needs-update (ewoc-data node)) nil)
3041 (ewoc-invalidate vc-status node) 3042 (ewoc-invalidate vc-status node)
3042 (setq entries (cdr entries) entry (car entries)) 3043 (setq entries (cdr entries) entry (car entries))
3043 (setq node (ewoc-next vc-status node)))))) 3044 (setq node (ewoc-next vc-status node))))))
@@ -3107,7 +3108,8 @@ Throw an error if another update process is in progress."
3107 (setq vc-status-process-buffer 3108 (setq vc-status-process-buffer
3108 (generate-new-buffer (format " *VC-%s* tmp status" backend)))) 3109 (generate-new-buffer (format " *VC-%s* tmp status" backend))))
3109 ;; set the needs-update flag on all entries 3110 ;; set the needs-update flag on all entries
3110 (ewoc-map (lambda (info) (setf (vc-status-fileinfo->needs-update info) t) nil) vc-status) 3111 (ewoc-map (lambda (info) (setf (vc-status-fileinfo->needs-update info) t) nil)
3112 vc-status)
3111 (lexical-let ((buffer (current-buffer))) 3113 (lexical-let ((buffer (current-buffer)))
3112 (with-current-buffer vc-status-process-buffer 3114 (with-current-buffer vc-status-process-buffer
3113 (cd def-dir) 3115 (cd def-dir)
@@ -3122,11 +3124,11 @@ Throw an error if another update process is in progress."
3122 (vc-status-update entries buffer) 3124 (vc-status-update entries buffer)
3123 (unless more-to-come 3125 (unless more-to-come
3124 (let ((remaining 3126 (let ((remaining
3125 (ewoc-collect vc-status 3127 (ewoc-collect
3126 (lambda (info) (vc-status-fileinfo->needs-update info))))) 3128 vc-status 'vc-status-fileinfo->needs-update)))
3127 (if remaining 3129 (if remaining
3128 (vc-status-refresh-files 3130 (vc-status-refresh-files
3129 (mapcar (lambda (info) (vc-status-fileinfo->name info)) remaining) 3131 (mapcar 'vc-status-fileinfo->name remaining)
3130 'up-to-date) 3132 'up-to-date)
3131 (setq mode-line-process nil)))))))))))) 3133 (setq mode-line-process nil))))))))))))
3132 3134