diff options
| author | Protesilaos Stavrou <info@protesilaos.com> | 2021-02-09 06:49:05 +0200 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2021-02-10 03:38:15 +0200 |
| commit | ff16c897eadab9bebc58bd0ca0fb5c8e1c237a15 (patch) | |
| tree | 24cd8a0d758054c9a0482976c109bc4363c95c33 /lisp/vc/vc-git.el | |
| parent | bff9bd0d3acff0fa0a50e21bdeca024e71fa518b (diff) | |
| download | emacs-ff16c897eadab9bebc58bd0ca0fb5c8e1c237a15.tar.gz emacs-ff16c897eadab9bebc58bd0ca0fb5c8e1c237a15.tar.bz2 emacs-ff16c897eadab9bebc58bd0ca0fb5c8e1c237a15.zip | |
Refine use of vc-dir faces; apply to all backends
* lisp/vc/vc-dir.el (vc-default-dir-printer): Add check for the
"ignored" status and make 'vc-dir-status-edited' the default face.
Also extend condition for more states that qualify as "warnings".
(vc-dir-ignored, vc-dir-status-ignored): Rename face for consistency.
* lisp/vc/vc-git.el (vc-git-dir-printer): Use the
'vc-dir-status-edited' as the default for the Git backend. And
reference the renamed face. Also stop treating the empty stash
differently from other header values.
* lisp/vc/vc-bzr.el (vc-bzr-dir-extra-headers): Implement new faces.
* lisp/vc/vc-cvs.el (vc-cvs-dir-extra-headers): Same.
* lisp/vc/vc-hg.el (vc-hg-dir-extra-headers): Same.
* lisp/vc/vc-svn.el (vc-svn-dir-extra-headers): Same.
This follows from the discussion in bug#46358.
Diffstat (limited to 'lisp/vc/vc-git.el')
| -rw-r--r-- | lisp/vc/vc-git.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index e7306386fea..25ae26d746a 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -479,7 +479,8 @@ or an empty string if none." (propertize (format "%-12s" state) 'face (cond ((eq state 'up-to-date) 'vc-dir-status-up-to-date) - ((eq state '(missing conflict)) 'vc-dir-status-warning) + ((memq state '(missing conflict)) 'vc-dir-status-warning) + ((eq state 'ignored) 'vc-dir-status-ignored) (t 'vc-dir-status-edited)) 'mouse-face 'highlight 'keymap vc-dir-status-mouse-map) @@ -835,7 +836,7 @@ or an empty string if none." (propertize "Nothing stashed" 'help-echo vc-git-stash-shared-help 'keymap vc-git-stash-shared-map - 'face 'vc-dir-ignored)))))) + 'face 'vc-dir-header-value)))))) (defun vc-git-branches () "Return the existing branches, as a list of strings. |