emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/modus-operandi-theme 58a9924 12/54: Add support for VDI


From: Stefan Monnier
Subject: [elpa] externals/modus-operandi-theme 58a9924 12/54: Add support for VDIFF
Date: Thu, 4 Jun 2020 08:20:11 -0400 (EDT)

branch: externals/modus-operandi-theme
commit 58a99245faef017ca48e61485c32b279d5ee8372
Author: Protesilaos Stavrou <info@protesilaos.com>
Commit: Protesilaos Stavrou <info@protesilaos.com>

    Add support for VDIFF
---
 README.org              |  1 +
 modus-operandi-theme.el | 19 +++++++++++++++++++
 modus-vivendi-theme.el  | 19 +++++++++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/README.org b/README.org
index 49dc19d..22ed876 100644
--- a/README.org
+++ b/README.org
@@ -760,6 +760,7 @@ the "full support" may not be 100% true…
 + undo-tree
 + vc (built-in mode line status for version control)
 + vc-annotate (=C-x v g=)
++ vdiff
 + vimish-fold
 + visible-mark
 + visual-regexp
diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el
index 953356e..99b987e 100644
--- a/modus-operandi-theme.el
+++ b/modus-operandi-theme.el
@@ -280,6 +280,7 @@
 ;;     undo-tree
 ;;     vc (built-in mode line status for version control)
 ;;     vc-annotate (C-x v g)
+;;     vdiff
 ;;     vimish-fold
 ;;     visible-mark
 ;;     visual-regexp
@@ -3089,6 +3090,24 @@ Also bind `class' to ((class color) (min-colors 89))."
    `(vc-removed-state ((,class (:foreground ,red-active))))
    `(vc-state-base ((,class (:foreground ,fg-active))))
    `(vc-up-to-date-state ((,class (:foreground ,fg-special-cold))))
+   ;;;; vdiff
+   `(vdiff-addition-face ((,class ,(modus-operandi-theme-diffs
+                                    bg-main green
+                                    bg-diff-focus-added fg-diff-focus-added))))
+   `(vdiff-change-face ((,class ,(modus-operandi-theme-diffs
+                                  bg-main yellow
+                                  bg-diff-focus-changed 
fg-diff-focus-changed))))
+   `(vdiff-closed-fold-face ((,class (:background ,bg-diff-neutral-1 
:foreground ,fg-diff-neutral-1))))
+   `(vdiff-refine-added ((,class ,(modus-operandi-theme-diffs
+                                   bg-diff-added fg-diff-added
+                                   bg-diff-refine-added 
fg-diff-refine-added))))
+   `(vdiff-refine-changed ((,class ,(modus-operandi-theme-diffs
+                                     bg-diff-changed fg-diff-changed
+                                     bg-diff-refine-changed 
fg-diff-refine-changed))))
+   `(vdiff-subtraction-face ((,class ,(modus-operandi-theme-diffs
+                                       bg-main red
+                                       bg-diff-focus-removed 
fg-diff-focus-removed))))
+   `(vdiff-target-face ((,class (:inherit modus-theme-intense-blue))))
    ;;;; vimish-fold
    `(vimish-fold-fringe ((,class (:foreground ,cyan-active))))
    `(vimish-fold-mouse-face ((,class (:inherit modus-theme-intense-blue))))
diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el
index 001f55b..9d00f91 100644
--- a/modus-vivendi-theme.el
+++ b/modus-vivendi-theme.el
@@ -280,6 +280,7 @@
 ;;     undo-tree
 ;;     vc (built-in mode line status for version control)
 ;;     vc-annotate (C-x v g)
+;;     vdiff
 ;;     vimish-fold
 ;;     visible-mark
 ;;     visual-regexp
@@ -3089,6 +3090,24 @@ Also bind `class' to ((class color) (min-colors 89))."
    `(vc-removed-state ((,class (:foreground ,red-active))))
    `(vc-state-base ((,class (:foreground ,fg-active))))
    `(vc-up-to-date-state ((,class (:foreground ,fg-special-cold))))
+   ;;;; vdiff
+   `(vdiff-addition-face ((,class ,(modus-vivendi-theme-diffs
+                                    bg-main green
+                                    bg-diff-focus-added fg-diff-focus-added))))
+   `(vdiff-change-face ((,class ,(modus-vivendi-theme-diffs
+                                  bg-main yellow
+                                  bg-diff-focus-changed 
fg-diff-focus-changed))))
+   `(vdiff-closed-fold-face ((,class (:background ,bg-diff-neutral-1 
:foreground ,fg-diff-neutral-1))))
+   `(vdiff-refine-added ((,class ,(modus-vivendi-theme-diffs
+                                   bg-diff-added fg-diff-added
+                                   bg-diff-refine-added 
fg-diff-refine-added))))
+   `(vdiff-refine-changed ((,class ,(modus-vivendi-theme-diffs
+                                     bg-diff-changed fg-diff-changed
+                                     bg-diff-refine-changed 
fg-diff-refine-changed))))
+   `(vdiff-subtraction-face ((,class ,(modus-vivendi-theme-diffs
+                                       bg-main red
+                                       bg-diff-focus-removed 
fg-diff-focus-removed))))
+   `(vdiff-target-face ((,class (:inherit modus-theme-intense-blue))))
    ;;;; vimish-fold
    `(vimish-fold-fringe ((,class (:foreground ,cyan-active))))
    `(vimish-fold-mouse-face ((,class (:inherit modus-theme-intense-blue))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]