diff options
| author | Lars Ingebrigtsen | 2016-03-01 14:25:27 +1100 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2016-03-01 14:25:27 +1100 |
| commit | 2621c293d82c15c00d9e73a8db75d70da7d0a23b (patch) | |
| tree | 5c2fbb1f9b302be1f79d809441b9e93a0d402493 | |
| parent | 3dd82d7501a28c1ac6cebb9a2fc14399413b5c40 (diff) | |
| download | emacs-2621c293d82c15c00d9e73a8db75d70da7d0a23b.tar.gz emacs-2621c293d82c15c00d9e73a8db75d70da7d0a23b.zip | |
Use colors in the VC mode lines
* lisp/vc/vc-hooks.el: Make the mode line faces default to
using colors to more clearly tell the user what the status is.
| -rw-r--r-- | lisp/vc/vc-hooks.el | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index 0c1718e94cb..6488e53ef02 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el | |||
| @@ -54,44 +54,51 @@ | |||
| 54 | :group 'vc-faces) | 54 | :group 'vc-faces) |
| 55 | 55 | ||
| 56 | (defface vc-needs-update-state | 56 | (defface vc-needs-update-state |
| 57 | '((default :inherit vc-state-base-face)) | 57 | '((default :inherit vc-state-base-face) |
| 58 | (((class color)) :foreground "blue" :weight bold)) | ||
| 58 | "Face for VC modeline state when the file needs update." | 59 | "Face for VC modeline state when the file needs update." |
| 59 | :version "25.1" | 60 | :version "25.1" |
| 60 | :group 'vc-faces) | 61 | :group 'vc-faces) |
| 61 | 62 | ||
| 62 | (defface vc-locked-state | 63 | (defface vc-locked-state |
| 63 | '((default :inherit vc-state-base-face)) | 64 | '((default :inherit vc-state-base-face) |
| 65 | (((class color)) :foreground "red")) | ||
| 64 | "Face for VC modeline state when the file locked." | 66 | "Face for VC modeline state when the file locked." |
| 65 | :version "25.1" | 67 | :version "25.1" |
| 66 | :group 'vc-faces) | 68 | :group 'vc-faces) |
| 67 | 69 | ||
| 68 | (defface vc-locally-added-state | 70 | (defface vc-locally-added-state |
| 69 | '((default :inherit vc-state-base-face)) | 71 | '((default :inherit vc-state-base-face) |
| 72 | (((class color)) :foreground "ForestGreen")) | ||
| 70 | "Face for VC modeline state when the file is locally added." | 73 | "Face for VC modeline state when the file is locally added." |
| 71 | :version "25.1" | 74 | :version "25.1" |
| 72 | :group 'vc-faces) | 75 | :group 'vc-faces) |
| 73 | 76 | ||
| 74 | (defface vc-conflict-state | 77 | (defface vc-conflict-state |
| 75 | '((default :inherit vc-state-base-face)) | 78 | '((default :inherit vc-state-base-face) |
| 79 | (((class color)) :foreground "red" :weight bold)) | ||
| 76 | "Face for VC modeline state when the file contains merge conflicts." | 80 | "Face for VC modeline state when the file contains merge conflicts." |
| 77 | :version "25.1" | 81 | :version "25.1" |
| 78 | :group 'vc-faces) | 82 | :group 'vc-faces) |
| 79 | 83 | ||
| 80 | (defface vc-removed-state | 84 | (defface vc-removed-state |
| 81 | '((default :inherit vc-state-base-face)) | 85 | '((default :inherit vc-state-base-face) |
| 86 | (((class color)) :foreground "red")) | ||
| 82 | "Face for VC modeline state when the file was removed from the VC system." | 87 | "Face for VC modeline state when the file was removed from the VC system." |
| 83 | :version "25.1" | 88 | :version "25.1" |
| 84 | :group 'vc-faces) | 89 | :group 'vc-faces) |
| 85 | 90 | ||
| 86 | (defface vc-missing-state | 91 | (defface vc-missing-state |
| 87 | '((default :inherit vc-state-base-face)) | 92 | '((default :inherit vc-state-base-face) |
| 93 | (((class color)) :foreground "red")) | ||
| 88 | "Face for VC modeline state when the file is missing from the file system." | 94 | "Face for VC modeline state when the file is missing from the file system." |
| 89 | :version "25.1" | 95 | :version "25.1" |
| 90 | :group 'vc-faces) | 96 | :group 'vc-faces) |
| 91 | 97 | ||
| 92 | (defface vc-edited-state | 98 | (defface vc-edited-state |
| 93 | '((default :inherit vc-state-base-face)) | 99 | '((default :inherit vc-state-base-face) |
| 94 | "Face for VC modeline state when the file is up to date." | 100 | (((class color)) :foreground "ForestGreen")) |
| 101 | "Face for VC modeline state when the file is edited." | ||
| 95 | :version "25.1" | 102 | :version "25.1" |
| 96 | :group 'vc-faces) | 103 | :group 'vc-faces) |
| 97 | 104 | ||