diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2021-01-30 15:42:19 +0200 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2021-01-30 15:42:19 +0200 |
| commit | 96f20120c97a0a329fff81a0cc3747082a8a2c55 (patch) | |
| tree | ebb51179bb47e9ee0719409213288dc4ccf9a2d8 | |
| parent | f7b9b9a85e40555a23ee56d75338a3c4e378e4f5 (diff) | |
| download | emacs-96f20120c97a0a329fff81a0cc3747082a8a2c55.tar.gz emacs-96f20120c97a0a329fff81a0cc3747082a8a2c55.tar.bz2 emacs-96f20120c97a0a329fff81a0cc3747082a8a2c55.zip | |
Also highlight 'conflict' with the warning face
* lisp/vc/vc-git.el (vc-git-dir-printer):
Also highlight 'conflict' with the warning face, like
vc-default-dir-printer does already.
| -rw-r--r-- | lisp/vc/vc-git.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 94fac3a83b8..d00c2c2133c 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -479,8 +479,8 @@ or an empty string if none." (propertize (format "%-12s" state) 'face (cond ((eq state 'up-to-date) 'font-lock-builtin-face) - ((eq state 'missing) 'font-lock-warning-face) - (t 'font-lock-variable-name-face)) + ((eq state '(missing conflict)) 'font-lock-warning-face) + (t 'font-lock-variable-name-face)) 'mouse-face 'highlight 'keymap vc-dir-status-mouse-map) " " (vc-git-permissions-as-string old-perm new-perm) |