From 887b3333d09a93446dd7bd478e4e877df2884bd7 Mon Sep 17 00:00:00 2001 Message-Id: <887b3333d09a93446dd7bd478e4e877df2884bd7.1612846159.git.info@protesilaos.com> From: Protesilaos Stavrou Date: Tue, 9 Feb 2021 06:49:05 +0200 Subject: [PATCH] Refine use of new vc-dir faces * lisp/vc/vc-dir.el (vc-default-dir-printer): Apply check for the "ignored" status and make 'vc-dir-status-edited' the default face. * lisp/vc/vc-git.el (vc-git-dir-printer): Use the same conditions for the Git backend. This follows from the discussion in bug#46358. --- lisp/vc/vc-dir.el | 4 ++-- lisp/vc/vc-git.el | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el index 14c81578b7..6aebd1b2e0 100644 --- a/lisp/vc/vc-dir.el +++ b/lisp/vc/vc-dir.el @@ -1456,8 +1456,8 @@ vc-default-dir-printer (format "%-20s" state) 'face (cond ((eq state 'up-to-date) 'vc-dir-status-up-to-date) ((memq state '(missing conflict)) 'vc-dir-status-warning) - ((eq state 'edited) 'font-lock-constant-face) - (t 'vc-dir-header-value)) + ((eq state 'ignored) 'vc-dir-ignored) + (t 'vc-dir-status-edited)) 'mouse-face 'highlight 'keymap vc-dir-status-mouse-map) " " diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index e7306386fe..18c5432ad9 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -479,7 +479,8 @@ vc-git-dir-printer (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-ignored) (t 'vc-dir-status-edited)) 'mouse-face 'highlight 'keymap vc-dir-status-mouse-map) -- 2.30.0