aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-10-03 06:09:30 +0000
committerDan Nicolaescu2008-10-03 06:09:30 +0000
commit7aaf911c40a5e8cbf201d492fc0505c6677887da (patch)
treec7e8b44d7623b44f4bdea6ae8dbcf55a54d44092
parent9091f2d335d153b71b0102c9524934eb912e30f1 (diff)
downloademacs-7aaf911c40a5e8cbf201d492fc0505c6677887da.tar.gz
emacs-7aaf911c40a5e8cbf201d492fc0505c6677887da.zip
(vc-dir-mode): Don't create the ewoc header here.
(vc-dir-refresh): Set it here instead. (Bug#1067)
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc-dir.el7
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6d3e9156983..97aa25e016e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-10-03 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * vc-dir.el (vc-dir-mode): Don't create the ewoc header here.
4 (vc-dir-refresh): Set it here instead. (Bug#1067)
5
12008-10-02 Chong Yidong <cyd@stupidchicken.com> 62008-10-02 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * faces.el (inhibit-frame-set-background-mode): New var. 8 * faces.el (inhibit-frame-set-background-mode): New var.
diff --git a/lisp/vc-dir.el b/lisp/vc-dir.el
index 87c0ce3ef90..d7ae86e079e 100644
--- a/lisp/vc-dir.el
+++ b/lisp/vc-dir.el
@@ -912,9 +912,7 @@ commands act on the files in those directories displayed in the
912 (let ((buffer-read-only nil)) 912 (let ((buffer-read-only nil))
913 (erase-buffer) 913 (erase-buffer)
914 (set (make-local-variable 'vc-dir-process-buffer) nil) 914 (set (make-local-variable 'vc-dir-process-buffer) nil)
915 (set (make-local-variable 'vc-ewoc) 915 (set (make-local-variable 'vc-ewoc) (ewoc-create #'vc-dir-status-printer))
916 (ewoc-create #'vc-dir-status-printer
917 (vc-dir-headers vc-dir-backend default-directory)))
918 (set (make-local-variable 'revert-buffer-function) 916 (set (make-local-variable 'revert-buffer-function)
919 'vc-dir-revert-buffer-function) 917 'vc-dir-revert-buffer-function)
920 (set (make-local-variable 'list-buffers-directory) 918 (set (make-local-variable 'list-buffers-directory)
@@ -1032,7 +1030,8 @@ Throw an error if another update process is in progress."
1032 (vc-dir-refresh-files 1030 (vc-dir-refresh-files
1033 (mapcar 'vc-dir-fileinfo->name remaining) 1031 (mapcar 'vc-dir-fileinfo->name remaining)
1034 'up-to-date) 1032 'up-to-date)
1035 (setq mode-line-process nil)))))))))))) 1033 (setq mode-line-process nil)))))))))
1034 (ewoc-set-hf vc-ewoc (vc-dir-headers backend def-dir) ""))))
1036 1035
1037(defun vc-dir-show-fileentry (file) 1036(defun vc-dir-show-fileentry (file)
1038 "Insert an entry for a specific file into the current *VC-dir* listing. 1037 "Insert an entry for a specific file into the current *VC-dir* listing.