diff options
| -rw-r--r-- | lisp/vc/vc-hooks.el | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index 6488e53ef02..0c1718e94cb 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el | |||
| @@ -54,51 +54,44 @@ | |||
| 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)) | ||
| 59 | "Face for VC modeline state when the file needs update." | 58 | "Face for VC modeline state when the file needs update." |
| 60 | :version "25.1" | 59 | :version "25.1" |
| 61 | :group 'vc-faces) | 60 | :group 'vc-faces) |
| 62 | 61 | ||
| 63 | (defface vc-locked-state | 62 | (defface vc-locked-state |
| 64 | '((default :inherit vc-state-base-face) | 63 | '((default :inherit vc-state-base-face)) |
| 65 | (((class color)) :foreground "red")) | ||
| 66 | "Face for VC modeline state when the file locked." | 64 | "Face for VC modeline state when the file locked." |
| 67 | :version "25.1" | 65 | :version "25.1" |
| 68 | :group 'vc-faces) | 66 | :group 'vc-faces) |
| 69 | 67 | ||
| 70 | (defface vc-locally-added-state | 68 | (defface vc-locally-added-state |
| 71 | '((default :inherit vc-state-base-face) | 69 | '((default :inherit vc-state-base-face)) |
| 72 | (((class color)) :foreground "ForestGreen")) | ||
| 73 | "Face for VC modeline state when the file is locally added." | 70 | "Face for VC modeline state when the file is locally added." |
| 74 | :version "25.1" | 71 | :version "25.1" |
| 75 | :group 'vc-faces) | 72 | :group 'vc-faces) |
| 76 | 73 | ||
| 77 | (defface vc-conflict-state | 74 | (defface vc-conflict-state |
| 78 | '((default :inherit vc-state-base-face) | 75 | '((default :inherit vc-state-base-face)) |
| 79 | (((class color)) :foreground "red" :weight bold)) | ||
| 80 | "Face for VC modeline state when the file contains merge conflicts." | 76 | "Face for VC modeline state when the file contains merge conflicts." |
| 81 | :version "25.1" | 77 | :version "25.1" |
| 82 | :group 'vc-faces) | 78 | :group 'vc-faces) |
| 83 | 79 | ||
| 84 | (defface vc-removed-state | 80 | (defface vc-removed-state |
| 85 | '((default :inherit vc-state-base-face) | 81 | '((default :inherit vc-state-base-face)) |
| 86 | (((class color)) :foreground "red")) | ||
| 87 | "Face for VC modeline state when the file was removed from the VC system." | 82 | "Face for VC modeline state when the file was removed from the VC system." |
| 88 | :version "25.1" | 83 | :version "25.1" |
| 89 | :group 'vc-faces) | 84 | :group 'vc-faces) |
| 90 | 85 | ||
| 91 | (defface vc-missing-state | 86 | (defface vc-missing-state |
| 92 | '((default :inherit vc-state-base-face) | 87 | '((default :inherit vc-state-base-face)) |
| 93 | (((class color)) :foreground "red")) | ||
| 94 | "Face for VC modeline state when the file is missing from the file system." | 88 | "Face for VC modeline state when the file is missing from the file system." |
| 95 | :version "25.1" | 89 | :version "25.1" |
| 96 | :group 'vc-faces) | 90 | :group 'vc-faces) |
| 97 | 91 | ||
| 98 | (defface vc-edited-state | 92 | (defface vc-edited-state |
| 99 | '((default :inherit vc-state-base-face) | 93 | '((default :inherit vc-state-base-face)) |
| 100 | (((class color)) :foreground "ForestGreen")) | 94 | "Face for VC modeline state when the file is up to date." |
| 101 | "Face for VC modeline state when the file is edited." | ||
| 102 | :version "25.1" | 95 | :version "25.1" |
| 103 | :group 'vc-faces) | 96 | :group 'vc-faces) |
| 104 | 97 | ||