Modify diff colors

Follow-up on #293.

- Make diff colors darker
- Have `ediff-*`, `magit-diff-*` inherit from `diff-*`

1 files changed, 19 insertions, 19 deletions

diff --git a/zenburn-theme.el b/zenburn-theme.el
index 1d28e30..17ce587 100644
--- a/zenburn-theme.el
+++ b/zenburn-theme.el
@@ -384,12 +384,12 @@ Also bind `class' to ((class color) (min-colors 89))."
    `(debbugs-gnu-stale ((t (:foreground ,zenburn-orange))))
    `(debbugs-gnu-tagged ((t (:foreground ,zenburn-red))))
 ;;;;; diff
-   `(diff-added          ((t (:background "#335533" :foreground ,zenburn-green))))
+   `(diff-added          ((t (:background ,zenburn-green-5 :foreground ,zenburn-green+2))))
    `(diff-changed        ((t (:background "#555511" :foreground ,zenburn-yellow-1))))
-   `(diff-removed        ((t (:background "#553333" :foreground ,zenburn-red-2))))
-   `(diff-refine-added   ((t (:background "#338833" :foreground ,zenburn-green+4))))
+   `(diff-removed        ((t (:background ,zenburn-red-6 :foreground ,zenburn-red+1))))
+   `(diff-refine-added   ((t (:background ,zenburn-green-4 :foreground ,zenburn-green+3))))
    `(diff-refine-change  ((t (:background "#888811" :foreground ,zenburn-yellow))))
-   `(diff-refine-removed ((t (:background "#883333" :foreground ,zenburn-red))))
+   `(diff-refine-removed ((t (:background ,zenburn-red-5 :foreground ,zenburn-red+2))))
    `(diff-header ((,class (:background ,zenburn-bg+2))
                   (t (:background ,zenburn-fg :foreground ,zenburn-bg))))
    `(diff-file-header
@@ -453,22 +453,22 @@ Also bind `class' to ((class color) (min-colors 89))."
    `(diredfl-symlink ((t (:foreground ,zenburn-yellow))))
    `(diredfl-write-priv ((t (:foreground ,zenburn-magenta))))
 ;;;;; ediff
-   `(ediff-current-diff-A ((t (:foreground ,zenburn-fg :background ,zenburn-red-4))))
-   `(ediff-current-diff-Ancestor ((t (:foreground ,zenburn-fg :background ,zenburn-red-4))))
-   `(ediff-current-diff-B ((t (:foreground ,zenburn-fg :background ,zenburn-green-2))))
-   `(ediff-current-diff-C ((t (:foreground ,zenburn-fg :background ,zenburn-blue-5))))
+   `(ediff-current-diff-A ((t (:inherit diff-removed))))
+   `(ediff-current-diff-Ancestor ((t (:inherit ediff-current-diff-A))))
+   `(ediff-current-diff-B ((t (:inherit diff-added))))
+   `(ediff-current-diff-C ((t (:foreground ,zenburn-blue+2 :background ,zenburn-blue-5))))
    `(ediff-even-diff-A ((t (:background ,zenburn-bg+1))))
    `(ediff-even-diff-Ancestor ((t (:background ,zenburn-bg+1))))
    `(ediff-even-diff-B ((t (:background ,zenburn-bg+1))))
    `(ediff-even-diff-C ((t (:background ,zenburn-bg+1))))
-   `(ediff-fine-diff-A ((t (:foreground ,zenburn-fg :background ,zenburn-red-2 :weight bold))))
-   `(ediff-fine-diff-Ancestor ((t (:foreground ,zenburn-fg :background ,zenburn-red-2 weight bold))))
-   `(ediff-fine-diff-B ((t (:foreground ,zenburn-fg :background ,zenburn-green :weight bold))))
-   `(ediff-fine-diff-C ((t (:foreground ,zenburn-fg :background ,zenburn-blue-3 :weight bold ))))
+   `(ediff-fine-diff-A ((t (:inherit diff-refine-removed :weight bold))))
+   `(ediff-fine-diff-Ancestor ((t (:inherit ediff-fine-diff-A))))
+   `(ediff-fine-diff-B ((t (:inherit diff-refine-added :weight bold))))
+   `(ediff-fine-diff-C ((t (:foreground ,zenburn-blue+3 :background ,zenburn-blue-4 :weight bold))))
    `(ediff-odd-diff-A ((t (:background ,zenburn-bg+2))))
-   `(ediff-odd-diff-Ancestor ((t (:background ,zenburn-bg+2))))
-   `(ediff-odd-diff-B ((t (:background ,zenburn-bg+2))))
-   `(ediff-odd-diff-C ((t (:background ,zenburn-bg+2))))
+   `(ediff-odd-diff-Ancestor ((t (:inherit ediff-odd-diff-A))))
+   `(ediff-odd-diff-B ((t (:inherit ediff-odd-diff-A))))
+   `(ediff-odd-diff-C ((t (:inherit ediff-odd-diff-A))))
 ;;;;; egg
    `(egg-text-base ((t (:foreground ,zenburn-fg))))
    `(egg-help-header-1 ((t (:foreground ,zenburn-yellow))))
@@ -887,10 +887,10 @@ Also bind `class' to ((class color) (min-colors 89))."
    `(magit-section-heading             ((t (:foreground ,zenburn-yellow :weight bold))))
    `(magit-section-heading-selection   ((t (:foreground ,zenburn-orange :weight bold))))
 
-   `(magit-diff-added-highlight ((t (:background ,zenburn-green))))
-   `(magit-diff-removed-highlight ((t (:background ,zenburn-red-3))))
-   `(magit-diff-added ((t (:background ,zenburn-green-2))))
-   `(magit-diff-removed ((t (:background ,zenburn-red-4))))
+   `(magit-diff-added ((t (:inherit diff-added))))
+   `(magit-diff-added-highlight ((t (:inherit diff-refine-added))))
+   `(magit-diff-removed ((t (:inherit diff-removed))))
+   `(magit-diff-removed-highlight ((t (:inherit diff-refine-removed))))
 
    `(magit-diff-file-heading           ((t (:weight bold))))
    `(magit-diff-file-heading-highlight ((t (:background ,zenburn-bg+05  :weight bold))))