aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/vc.el11
2 files changed, 15 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0272d6cbec1..c08c62621d5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12008-01-24 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * vc.el: Add a TODO item about missing files.
4 (vc-exec-after): Add a tooltip to the new mode-line item.
5
6
12008-01-24 Glenn Morris <rgm@gnu.org> 72008-01-24 Glenn Morris <rgm@gnu.org>
2 8
3 * t-mouse.el (gpm-mouse-start): Declare as a function. 9 * t-mouse.el (gpm-mouse-start): Declare as a function.
diff --git a/lisp/vc.el b/lisp/vc.el
index aaac484fb7b..b51a706a2a6 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -559,6 +559,11 @@
559;; 559;;
560;; - vc-status needs a menu, mouse bindings and some color bling. 560;; - vc-status needs a menu, mouse bindings and some color bling.
561;; 561;;
562;; - vc-status needs to show missing files. It probably needs to have
563;; another state for those files. The user might want to restore
564;; them, or remove them from the VCS. C-x v v might also need
565;; adjustments.
566;;
562;; - "snapshots" should be renamed to "branches", and thoroughly reworked. 567;; - "snapshots" should be renamed to "branches", and thoroughly reworked.
563;; 568;;
564 569
@@ -1028,8 +1033,10 @@ Else, add CODE to the process' sentinel."
1028 (setq mode-line-process 1033 (setq mode-line-process
1029 ;; Deliberate overstatement, but power law respected. 1034 ;; Deliberate overstatement, but power law respected.
1030 ;; (The message is ephemeral, so we make it loud.) --ttn 1035 ;; (The message is ephemeral, so we make it loud.) --ttn
1031 (propertize " (incomplete / in progress)" 1036 (propertize " (incomplete/in progress)"
1032 'face 'compilation-warning)) 1037 'face 'compilation-warning
1038 'help-echo
1039 "A VC command is in progress in this buffer"))
1033 (let ((previous (process-sentinel proc))) 1040 (let ((previous (process-sentinel proc)))
1034 (unless (eq previous 'vc-process-sentinel) 1041 (unless (eq previous 'vc-process-sentinel)
1035 (process-put proc 'vc-previous-sentinel previous)) 1042 (process-put proc 'vc-previous-sentinel previous))