[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))))
- [elpa] externals/modus-operandi-theme ae0e956 25/54: Fix regression with byte compilation, (continued)
- [elpa] externals/modus-operandi-theme ae0e956 25/54: Fix regression with byte compilation, Stefan Monnier, 2020/06/04
- [elpa] externals/modus-operandi-theme 7a8a7cb 19/54: Implement minor palette tweaks for Modus Operandi, Stefan Monnier, 2020/06/04
- [elpa] externals/modus-operandi-theme 1faab94 30/54: Tweak MAGIT header line key colour, Stefan Monnier, 2020/06/04
- [elpa] externals/modus-operandi-theme 9b5d56d 33/54: Add support for EROS, Stefan Monnier, 2020/06/04
- [elpa] externals/modus-operandi-theme 40667a5 37/54: Review EROS face (better for longer echo messages), Stefan Monnier, 2020/06/04
- [elpa] externals/modus-operandi-theme 39809b0 39/54: Review IMENU-LIST faces (more harmonious combos), Stefan Monnier, 2020/06/04
- [elpa] externals/modus-operandi-theme e42eb37 45/54: Add support for missing `helm-comint-*' faces, Stefan Monnier, 2020/06/04
- [elpa] externals/modus-operandi-theme 4a9bd23 06/54: Apply optional highest scale to org-document-title, Stefan Monnier, 2020/06/04
- [elpa] externals/modus-operandi-theme feaef70 08/54: Refine ORG-MODE faces for mixed font workflows, Stefan Monnier, 2020/06/04
- [elpa] externals/modus-operandi-theme c72b01c 11/54: Add support for INDIUM, Stefan Monnier, 2020/06/04
- [elpa] externals/modus-operandi-theme 58a9924 12/54: Add support for VDIFF,
Stefan Monnier <=
- [elpa] externals/modus-operandi-theme 91ce02b 09/54: Expand README on face customisation, Stefan Monnier, 2020/06/04
- [elpa] externals/modus-operandi-theme 4b3f6a3 27/54: Add tentative support for CIRCE, Stefan Monnier, 2020/06/04
- [elpa] externals/modus-operandi-theme 148f73a 46/54: Add support for missing `helm-eshell-*' faces, Stefan Monnier, 2020/06/04
- [elpa] externals/modus-operandi-theme 7c67f73 50/54: Add support for EL-SEARCH, Stefan Monnier, 2020/06/04
- [elpa] externals/modus-operandi-theme f76c36a 13/54: Major review of colours for tabs. Tweak faces., Stefan Monnier, 2020/06/04
- [elpa] externals/modus-operandi-theme a937f90 14/54: Modus Vivendi: tweak colour for header lines, Stefan Monnier, 2020/06/04
- [elpa] externals/modus-operandi-theme 78a2baf 18/54: Clarify that Org #+TITLE does not scale in v0.8.1, Stefan Monnier, 2020/06/04
- [elpa] externals/modus-operandi-theme a99bec3 20/54: Improve README section on font family settings, Stefan Monnier, 2020/06/04
- [elpa] externals/modus-operandi-theme 985675e 21/54: Allow byte compile with `eval-when-compile', Stefan Monnier, 2020/06/04
- [elpa] externals/modus-operandi-theme c05fbab 22/54: Do not `autoload' defcustom, Stefan Monnier, 2020/06/04