solarized-emacs

commit 9eafc27965bab14ef839da950e3d33ba5cca815a
parent d66634a97eef8ca4b7b36293c115ddc71bbf5552
Author: Thomas Frössman <thomasf@jossystem.se>
Date:   Thu, 25 Jul 2013 06:01:21 -0700

Merge pull request #73 from phaebz/master

Add ediff-*-C faces for three way ediff
Diffstat:
M
solarized.el
 | 
10
+++++++++-

1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/solarized.el b/solarized.el
@@ -434,6 +434,10 @@ customize the resulting theme."
      ;; ediff
      `(ediff-fine-diff-A ((,class (:background ,orange-lc))))
      `(ediff-fine-diff-B ((,class (:background ,green-lc))))
+     `(ediff-fine-diff-C ((,class (:background ,yellow-lc))))
+     
+     `(ediff-current-diff-C ((,class (:background ,blue-lc))))
+     
      `(ediff-even-diff-A ((,class (:background ,solarized-comments
                                                :foreground ,solarized-fg-lc ))))
      `(ediff-odd-diff-A ((,class (:background ,solarized-comments
@@ -442,7 +446,11 @@ customize the resulting theme."
                                                :foreground ,solarized-fg-hc ))))
      `(ediff-odd-diff-B ((,class (:background ,solarized-comments
                                               :foreground ,solarized-fg-lc ))))
-
+     `(ediff-even-diff-C ((,class (:background ,solarized-comments
+                                               :foreground ,solarized-fg ))))
+     `(ediff-odd-diff-C ((,class (:background ,solarized-comments
+                                              :foreground ,solarized-bg ))))
+     
      ;; epc
      `(epc:face-title ((,class (:foreground ,blue :background ,solarized-bg
                                             :weight normal :underline nil))))