[elpa] externals/modus-operandi-theme cebd31a 023/112: Use fewer backgrounds in Magit diff: see issue #18

[Stefan Monnier]

branch: externals/modus-operandi-theme
commit cebd31a5f2021445028cb9a08825aa3a02dd4e53
Author: Protesilaos Stavrou <address@hidden>
Commit: Protesilaos Stavrou <address@hidden>

    Use fewer backgrounds in Magit diff: see issue #18
---
 modus-operandi-theme.el | 26 +++++++++++++-------------
 modus-vivendi-theme.el  | 26 +++++++++++++-------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el
index f00a1f3..a927b90 100644
--- a/modus-operandi-theme.el
+++ b/modus-operandi-theme.el
@@ -1569,27 +1569,27 @@ between foreground and background is >= 7:1)."
    `(magit-branch-upstream ((,class (:slant italic))))
    `(magit-cherry-equivalent ((,class (:background ,bg-main :foreground 
,magenta-intense))))
    `(magit-cherry-unmatched ((,class (:background ,bg-main :foreground 
,cyan-intense))))
-   `(magit-diff-added ((,class (:inherit modus-theme-subtle-green))))
-   `(magit-diff-added-highlight ((,class (:inherit modus-theme-refine-green))))
-   `(magit-diff-base ((,class (:inherit modus-theme-subtle-yellow))))
-   `(magit-diff-base-highlight ((,class (:inherit modus-theme-refine-yellow))))
+   `(magit-diff-added ((,class (:foreground ,green))))
+   `(magit-diff-added-highlight ((,class (:foreground ,green))))
+   `(magit-diff-base ((,class (:foreground ,yellow))))
+   `(magit-diff-base-highlight ((,class (:foreground ,yellow))))
    `(magit-diff-changed ((,class (:weight bold))))
    `(magit-diff-changed-highlight ((,class (:weight bold))))
-   `(magit-diff-context ((,class (:background ,bg-main :foreground ,fg-alt))))
-   `(magit-diff-context-highlight ((,class (:background ,bg-alt :foreground 
,fg-alt))))
+   `(magit-diff-context ((,class (:foreground ,fg-alt))))
+   `(magit-diff-context-highlight ((,class (:foreground ,fg-alt))))
    `(magit-diff-file-heading ((,class (:background ,bg-main :foreground 
,fg-special-cold :weight bold))))
    `(magit-diff-file-heading-highlight ((,class (:inherit 
modus-theme-special-cold :weight bold))))
    `(magit-diff-file-heading-selection ((,class (:background ,bg-alt 
:foreground ,cyan))))
-   `(magit-diff-hunk-heading ((,class (:background ,bg-main :foreground 
,fg-special-warm :weight bold))))
-   `(magit-diff-hunk-heading-highlight ((,class (:inherit 
modus-theme-special-cold :weight bold))))
+   `(magit-diff-hunk-heading ((,class (:foreground ,fg-special-warm :weight 
bold))))
+   `(magit-diff-hunk-heading-highlight ((,class (:inherit 
modus-theme-special-warm :weight bold))))
    `(magit-diff-hunk-heading-selection ((,class (:inherit 
magit-diff-file-heading-selection))))
-   `(magit-diff-hunk-region ((,class (:weight bold)))) ; has no effect?
+   `(magit-diff-hunk-region ((,class (:background ,bg-region :foreground 
,fg-main))))
    `(magit-diff-lines-boundary ((,class (:background ,fg-main))))
    `(magit-diff-lines-heading ((,class (:inherit modus-theme-refine-magenta))))
-   `(magit-diff-removed ((,class (:inherit modus-theme-subtle-red))))
-   `(magit-diff-removed-highlight ((,class (:inherit modus-theme-refine-red))))
-   `(magit-diffstat-added ((,class (:background ,bg-main :foreground ,green))))
-   `(magit-diffstat-removed ((,class (:background ,bg-main :foreground ,red))))
+   `(magit-diff-removed ((,class (:foreground ,red))))
+   `(magit-diff-removed-highlight ((,class (:foreground ,red))))
+   `(magit-diffstat-added ((,class (:foreground ,green))))
+   `(magit-diffstat-removed ((,class (:foreground ,red))))
    `(magit-dimmed ((,class (:foreground ,fg-alt))))
    `(magit-filename ((,class (:foreground ,fg-special-cold))))
    `(magit-hash ((,class (:foreground ,fg-special-warm))))
diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el
index 88a7168..2c60830 100644
--- a/modus-vivendi-theme.el
+++ b/modus-vivendi-theme.el
@@ -1569,27 +1569,27 @@ between foreground and background is >= 7:1)."
    `(magit-branch-upstream ((,class (:slant italic))))
    `(magit-cherry-equivalent ((,class (:background ,bg-main :foreground 
,magenta-intense))))
    `(magit-cherry-unmatched ((,class (:background ,bg-main :foreground 
,cyan-intense))))
-   `(magit-diff-added ((,class (:inherit modus-theme-subtle-green))))
-   `(magit-diff-added-highlight ((,class (:inherit modus-theme-refine-green))))
-   `(magit-diff-base ((,class (:inherit modus-theme-subtle-yellow))))
-   `(magit-diff-base-highlight ((,class (:inherit modus-theme-refine-yellow))))
+   `(magit-diff-added ((,class (:foreground ,green))))
+   `(magit-diff-added-highlight ((,class (:foreground ,green))))
+   `(magit-diff-base ((,class (:foreground ,yellow))))
+   `(magit-diff-base-highlight ((,class (:foreground ,yellow))))
    `(magit-diff-changed ((,class (:weight bold))))
    `(magit-diff-changed-highlight ((,class (:weight bold))))
-   `(magit-diff-context ((,class (:background ,bg-main :foreground ,fg-alt))))
-   `(magit-diff-context-highlight ((,class (:background ,bg-alt :foreground 
,fg-alt))))
+   `(magit-diff-context ((,class (:foreground ,fg-alt))))
+   `(magit-diff-context-highlight ((,class (:foreground ,fg-alt))))
    `(magit-diff-file-heading ((,class (:background ,bg-main :foreground 
,fg-special-cold :weight bold))))
    `(magit-diff-file-heading-highlight ((,class (:inherit 
modus-theme-special-cold :weight bold))))
    `(magit-diff-file-heading-selection ((,class (:background ,bg-alt 
:foreground ,cyan))))
-   `(magit-diff-hunk-heading ((,class (:background ,bg-main :foreground 
,fg-special-warm :weight bold))))
-   `(magit-diff-hunk-heading-highlight ((,class (:inherit 
modus-theme-special-cold :weight bold))))
+   `(magit-diff-hunk-heading ((,class (:foreground ,fg-special-warm :weight 
bold))))
+   `(magit-diff-hunk-heading-highlight ((,class (:inherit 
modus-theme-special-warm :weight bold :extend nil))))
    `(magit-diff-hunk-heading-selection ((,class (:inherit 
magit-diff-file-heading-selection))))
-   `(magit-diff-hunk-region ((,class (:weight bold)))) ; has no effect?
+   `(magit-diff-hunk-region ((,class (:background ,bg-region :foreground 
,fg-main))))
    `(magit-diff-lines-boundary ((,class (:background ,fg-main))))
    `(magit-diff-lines-heading ((,class (:inherit modus-theme-refine-magenta))))
-   `(magit-diff-removed ((,class (:inherit modus-theme-subtle-red))))
-   `(magit-diff-removed-highlight ((,class (:inherit modus-theme-refine-red))))
-   `(magit-diffstat-added ((,class (:background ,bg-main :foreground ,green))))
-   `(magit-diffstat-removed ((,class (:background ,bg-main :foreground ,red))))
+   `(magit-diff-removed ((,class (:foreground ,red))))
+   `(magit-diff-removed-highlight ((,class (:foreground ,red))))
+   `(magit-diffstat-added ((,class (:foreground ,green))))
+   `(magit-diffstat-removed ((,class (:foreground ,red))))
    `(magit-dimmed ((,class (:foreground ,fg-alt))))
    `(magit-filename ((,class (:foreground ,fg-special-cold))))
    `(magit-hash ((,class (:foreground ,fg-special-warm))))