solarized-emacs

commit 96065f64663bbeb9d48a6e0e745ea44a0130bd47
parent 6a782bcb7cec2d631c93ccfc091b5f2c7f81ee14
Author: Thomas Frössman <thomasf@jossystem.se>
Date:   Fri, 28 Dec 2012 14:37:13 -0800

Merge pull request #49 from vitoshka/ediff

Add ediff and improve diff
Diffstat:
M
solarized.el
 | 
17
++++++++++++++---

1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/solarized.el b/solarized.el
@@ -98,6 +98,9 @@
 
          ;; Light/Dark adaptive higher/lower contrast accented colors
          ;; Only use these in exceptional cirmumstances!
+         (solarized-fg-hc (if (eq variant 'light) base3 base03))
+         (solarized-fg-lc (if (eq variant 'light) base03 base3))
+
          (yellow-hc (if (eq variant 'light) yellow-d yellow-l))
          (yellow-lc (if (eq variant 'light) yellow-l yellow-d))
          (orange-hc (if (eq variant 'light) orange-d orange-l))
@@ -300,13 +303,21 @@
      `(custom-state ((,class (:foreground ,green))))
 
      ;; diff
-     `(diff-added ((,class (:foreground ,green))))
-     `(diff-changed ((,class (:foreground ,yellow))))
-     `(diff-removed ((,class (:foreground ,red))))
+     `(diff-added ((,class (:foreground ,green :background ,solarized-bg))))
+     `(diff-changed ((,class (:foreground ,yellow :background ,solarized-bg))))
+     `(diff-removed ((,class (:foreground ,red :background ,solarized-bg))))
      `(diff-header ((,class (:background ,solarized-bg))))
      `(diff-file-header
        ((,class (:background ,solarized-bg :foreground ,solarized-fg :weight bold))))
 
+     ;; ediff
+     `(ediff-fine-diff-A ((,class (:background ,orange-lc))))
+     `(ediff-fine-diff-B ((,class (:background ,green-lc))))
+     `(ediff-even-diff-A ((,class (:background ,solarized-comments :foreground ,solarized-fg-lc ))))
+     `(ediff-odd-diff-A ((,class (:background ,solarized-comments :foreground ,solarized-fg-hc ))))
+     `(ediff-even-diff-B ((,class (:background ,solarized-comments :foreground ,solarized-fg-hc ))))
+     `(ediff-odd-diff-B ((,class (:background ,solarized-comments :foreground ,solarized-fg-lc ))))
+
      ;; epc
      `(epc:face-title ((,class (:foreground ,magenta :weight bold))))