diff options
| author | Thien-Thi Nguyen | 2008-01-26 20:04:49 +0000 |
|---|---|---|
| committer | Thien-Thi Nguyen | 2008-01-26 20:04:49 +0000 |
| commit | 832ffa7c8ef161baba18792b6e26065c19d5b15c (patch) | |
| tree | 4750526540aee97be4990d08c0d64da7adabbda1 | |
| parent | 66991ff0a0e2b703dcd3779398ef22141bc56ecf (diff) | |
| download | emacs-832ffa7c8ef161baba18792b6e26065c19d5b15c.tar.gz emacs-832ffa7c8ef161baba18792b6e26065c19d5b15c.zip | |
(vc-exec-after): For mode-line-process highlighting, if feature
`compile' is not available, fall back to font-lock-warning-face.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/vc.el | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1e67505cb70..9d87c313f3a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,4 +1,9 @@ | |||
| 1 | 2008-01-26 Phil Sung <psung@mit.edu> (tiny change) | 1 | 2008-01-26 Thien-Thi Nguyen <ttn@gnuvola.org> |
| 2 | |||
| 3 | * vc.el (vc-exec-after): For mode-line-process highlighting, if | ||
| 4 | `compile' is not available, fall back to font-lock-warning-face. | ||
| 5 | |||
| 6 | 2008-01-26 Phil Sung <psung@mit.edu> (tiny change) | ||
| 2 | 7 | ||
| 3 | * wdired.el (wdired-get-filename): Change `(1+ beg)' to `beg' so | 8 | * wdired.el (wdired-get-filename): Change `(1+ beg)' to `beg' so |
| 4 | that the filename end is found even when the filename is empty. | 9 | that the filename end is found even when the filename is empty. |
diff --git a/lisp/vc.el b/lisp/vc.el index 0069c124866..ce212314491 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -1036,7 +1036,11 @@ Else, add CODE to the process' sentinel." | |||
| 1036 | ;; Deliberate overstatement, but power law respected. | 1036 | ;; Deliberate overstatement, but power law respected. |
| 1037 | ;; (The message is ephemeral, so we make it loud.) --ttn | 1037 | ;; (The message is ephemeral, so we make it loud.) --ttn |
| 1038 | (propertize " (incomplete/in progress)" | 1038 | (propertize " (incomplete/in progress)" |
| 1039 | 'face 'compilation-warning | 1039 | 'face (if (featurep 'compile) |
| 1040 | ;; ttn's preferred loudness | ||
| 1041 | 'compilation-warning | ||
| 1042 | ;; suitably available fallback | ||
| 1043 | font-lock-warning-face) | ||
| 1040 | 'help-echo | 1044 | 'help-echo |
| 1041 | "A VC command is in progress in this buffer")) | 1045 | "A VC command is in progress in this buffer")) |
| 1042 | (let ((previous (process-sentinel proc))) | 1046 | (let ((previous (process-sentinel proc))) |