mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Refine use of vc-dir faces; apply to all backends

Browse source 
* 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.
This commit is contained in:
Protesilaos Stavrou 2021-02-09 06:49:05 +02:00 • committed by Dmitry Gutov
parent bff9bd0d3a
commit ff16c897ea
6 changed files with 35 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lisp/vc/vc-dir.el
View file

@ -86,7 +86,7 @@ See `run-hooks'."
"Face for up-to-date status in VC-dir buffers."
:group 'vc)
(defface vc-dir-ignored '((t :inherit shadow))
(defface vc-dir-status-ignored '((t :inherit shadow))
"Face for ignored or empty values in VC-dir buffers."
:group 'vc)
@ -1454,10 +1454,12 @@ These are the commands available for use in the file status buffer:
" "
(propertize
(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))
'face (cond
((eq state 'up-to-date) 'vc-dir-status-up-to-date)
((memq state '(missing conflict needs-update unlocked-changes))
'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)
" "