Permalink
Browse files

Add ediff faces.

 The faces were completely indistinguishable, especially in terminal.
  • Loading branch information...
1 parent 6a782bc commit c3edb6f8be3674375378674148164a0cfe8a8eec @vspinu vspinu committed Dec 28, 2012
Showing with 11 additions and 0 deletions.
  1. +11 −0 solarized.el
View
@@ -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))
@@ -307,6 +310,14 @@
`(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))))

0 comments on commit c3edb6f

Please sign in to comment.