Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Define new faces for all VC states #222

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 42 additions & 7 deletions extensions/dirvish-vc.el
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@

(defcustom dirvish-vc-state-face-alist
'((up-to-date . nil)
(edited . vc-edited-state)
(added . vc-locally-added-state)
(removed . vc-removed-state)
(missing . vc-missing-state)
(edited . dirvish-vc-edited-state)
(added . dirvish-vc-added-state)
(removed . dirvish-vc-removed-state)
(missing . dirvish-vc-missing-state)
(needs-merge . dirvish-vc-needs-merge-face)
(conflict . vc-conflict-state)
(unlocked-changes . vc-locked-state)
(needs-update . vc-needs-update-state)
(conflict . dirvish-vc-conflict-state)
(unlocked-changes . dirvish-vc-locked-state)
(needs-update . dirvish-vc-needs-update-state)
(ignored . dired-ignored)
(unregistered . dirvish-vc-unregistered-face))
"Alist of (VC-STATE . FACE).
Expand All @@ -55,6 +55,41 @@ vc-hooks.el) for detail explanation of these states."
"Face for commit message overlays."
:group 'dirvish)

(defface dirvish-vc-edited-state
'((t :inherit vc-edited-state))
"Face used for `edited' vc state in the Dirvish buffer."
:group 'dirvish)

(defface dirvish-vc-added-state
'((t :inherit vc-locally-added-state))
"Face used for `added' vc state in the Dirvish buffer."
:group 'dirvish)

(defface dirvish-vc-removed-state
'((t :inherit vc-removed-state))
"Face used for `removed' vc state in the Dirvish buffer."
:group 'dirvish)

(defface dirvish-vc-missing-state
'((t :inherit vc-missing-state))
"Face used for `missing' vc state in the Dirvish buffer."
:group 'dirvish)

(defface dirvish-vc-conflict-state
'((t :inherit vc-conflict-state))
"Face used for `conflict' vc state in the Dirvish buffer."
:group 'dirvish)

(defface dirvish-vc-locked-state
'((t :inherit vc-locked-state))
"Face used for `locked' vc state in the Dirvish buffer."
:group 'dirvish)

(defface dirvish-vc-needs-update-state
'((t :inherit vc-needs-update-state))
"Face used for `needs-update' vc state in the Dirvish buffer."
:group 'dirvish)

(defvar vc-dir-process-buffer)

(cl-defmethod transient-infix-set ((obj dirvish-vc-preview) value)
Expand Down