solarized-emacs

commit c8ac93a9a6a6f13c2f4eb464c3b52b01e76062f8
parent 8cc982ccaa591ec25367dcf2d8ff1331bf9a3b57
Author: phaebz <phaebz@gmail.com>
Date:   Thu, 25 Jul 2013 00:41:46 +0200

Add ediff-*-C faces for three way ediff a la ediff-files3 or during magit merge conflict.

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))))