From 96f20120c97a0a329fff81a0cc3747082a8a2c55 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Sat, 30 Jan 2021 15:42:19 +0200 Subject: [PATCH] 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. --- lisp/vc/vc-git.el | 4 ++-- 1 file 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) -- 2.39.2