aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2008-04-09 20:23:11 +0000
committerStefan Monnier2008-04-09 20:23:11 +0000
commit5bad314022cf58cdfcebd29d63ff15a5e68b2c9e (patch)
treec3123e3bbe7a446235bc1102e82bb68a27c1415c
parenteb56296236e23bfb77acd3c8151d3fe252c4260a (diff)
downloademacs-5bad314022cf58cdfcebd29d63ff15a5e68b2c9e.tar.gz
emacs-5bad314022cf58cdfcebd29d63ff15a5e68b2c9e.zip
(vc-default-mode-line-string): Use ? for missing.
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/vc-hooks.el2
2 files changed, 5 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d256a4043db..a54975f5586 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,12 +1,12 @@
12008-04-09 Michael Albinus <michael.albinus@gmx.de> 12008-04-09 Michael Albinus <michael.albinus@gmx.de>
2 2
3 * net/tramp.el (tramp-find-file-name-coding-system-alist): New 3 * net/tramp.el (tramp-find-file-name-coding-system-alist): New defun.
4 defun. 4 (tramp-handle-insert-file-contents, tramp-handle-write-region): Use it.
5 (tramp-handle-insert-file-contents, tramp-handle-write-region):
6 Use it.
7 5
82008-04-09 Stefan Monnier <monnier@iro.umontreal.ca> 62008-04-09 Stefan Monnier <monnier@iro.umontreal.ca>
9 7
8 * vc-hooks.el (vc-default-mode-line-string): Use ? for missing.
9
10 * minibuffer.el (minibuffer): Move group from cus-edit.el. 10 * minibuffer.el (minibuffer): Move group from cus-edit.el.
11 (completion-auto-help): Move from C code. 11 (completion-auto-help): Move from C code.
12 (minibuffer--maybe-completion-help): Remove. 12 (minibuffer--maybe-completion-help): Remove.
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 05adcd5c6aa..674d906840d 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -866,7 +866,7 @@ This function assumes that the file is registered."
866 (concat backend "!" rev)) 866 (concat backend "!" rev))
867 ((eq state 'missing) 867 ((eq state 'missing)
868 (setq state-echo "File tracked by the VC system, but missing from the file system") 868 (setq state-echo "File tracked by the VC system, but missing from the file system")
869 (concat backend "^" rev)) 869 (concat backend "?" rev))
870 (t 870 (t
871 ;; Not just for the 'edited state, but also a fallback 871 ;; Not just for the 'edited state, but also a fallback
872 ;; for all other states. Think about different symbols 872 ;; for all other states. Think about different symbols