commit 6855049c84d03682c5f0f957e4330610a3c8f3e8
parent 574d93891ad65b5037c4821ffbd55f44900b365c
Author: Thomas Frössman <thomasf@jossystem.se>
Date: Fri, 26 Sep 2014 20:48:35 +0200
Add alternative ediff colors
Try to make it less chaotic. Commented out for now.
Diffstat:
| M | solarized.el | | | 81 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
1 file changed, 81 insertions(+), 0 deletions(-)
diff --git a/solarized.el b/solarized.el
@@ -656,6 +656,87 @@ customize the resulting theme."
`(ediff-odd-diff-C ((,class (:background ,base01
:foreground ,base03 ))))
+ ;;;; alternative ediiff (not finished)
+ ;; ;; ediff
+ ;; `(ediff-fine-diff-A ((,class (
+ ;; :background ,(solarized-color-blend blue base03 0.25))
+ ;; )))
+ ;; `(ediff-fine-diff-B ((,class (
+ ;; :background ,(solarized-color-blend violet base03 0.25))
+ ;; )))
+ ;; `(ediff-fine-diff-C ((,class (
+ ;; :background ,(solarized-color-blend yellow base03 0.25))
+ ;; )))
+
+ ;; `(ediff-current-diff-A ((,class (
+ ;; :background ,(solarized-color-blend blue base03 0.15)
+
+ ;; ))))
+ ;; `(ediff-current-diff-B ((,class (
+ ;; :background ,(solarized-color-blend violet base03 0.15)
+
+ ;; ))))
+ ;; `(ediff-current-diff-C ((,class (
+ ;; :background ,(solarized-color-blend yellow base03 0.15)
+
+ ;; ))))
+
+ ;; `(ediff-even-diff-A ((,class (
+ ;; ;; :background ,(solarized-color-blend base0 base03 0.15)
+ ;; :background ,base02
+ ;; ;; :foreground ,base2
+ ;; ;; :background ,(solarized-color-blend green base02 0.15)
+ ;; ))))
+ ;; `(ediff-even-diff-B ((,class (
+ ;; ;; :background ,base01
+ ;; :background ,base02
+ ;; ;; :foreground ,base2
+ ;; ))))
+ ;; `(ediff-even-diff-C ((,class (
+ ;; ;; :background ,base01
+ ;; :background ,base02
+ ;; ;; :foreground ,base2
+ ;; ))))
+
+
+ ;; `(ediff-odd-diff-A ((,class (
+ ;; ;; :background ,base01
+ ;; :background ,base02
+ ;; ))))
+ ;; `(ediff-odd-diff-B ((,class (
+ ;; ;; :background ,base01
+ ;; :background ,base02
+ ;; ))))
+ ;; `(ediff-odd-diff-C ((,class (
+ ;; ;; :background ,base01
+ ;; :background ,base03
+ ;; ))))
+
+ ;; `(ediff-current-diff-Ancestor ((,class (:background "VioletRed" :foreground "Black"))))
+ ;; `(ediff-even-diff-Ancestor ((,class (:background "Grey" :foreground "White"))))
+ ;; `(ediff-fine-diff-Ancestor ((,class (:background "Green" :foreground "Black"))))
+ ;; `(ediff-odd-diff-Ancestor ((,class (:background "gray40" :foreground "cyan3"))))
+
+
+ ;; `(ediff-even-diff-A ((,class (:underline ,base01))))
+ ;; `(ediff-odd-diff-A ((,class (:underline ,base01
+
+ ;; ))))
+
+ ;; `(ediff-even-diff-B ((,class (:background ,base01
+ ;; :foreground ,base03
+ ;; ))))
+ ;; `(ediff-odd-diff-B ((,class (:background ,base01
+ ;; :foreground ,base03
+ ;; ))))
+
+ ;; `(ediff-even-diff-C ((,class (:background ,base01
+ ;; :foreground ,base0
+ ;; ))))
+ ;; `(ediff-odd-diff-C ((,class (:background ,base01
+ ;; :foreground ,base03
+ ;; ))))
+
;; diff-hl
`(diff-hl-change ((,class (:background ,blue-lc :foreground ,blue-hc))))
`(diff-hl-delete ((,class (:background ,red-lc :foreground ,red-hc))))
