commit 2fbff753888b39440ee8f83bfde793445880faaa
parent 42a86df47b80ea5d9289735734911fcfb3aa878e
Author: Jimmy Yuen Ho Wong <wyuenho@users.noreply.github.com>
Date: Thu, 15 Mar 2018 10:22:07 +0000
[Fix #194] Unified diff diff-hl ediff and smerge faces (#282)
Diffstat:
| M | solarized.el | | | 141 | +++++++++++++++++++------------------------------------------------------------ |
1 file changed, 34 insertions(+), 107 deletions(-)
diff --git a/solarized.el b/solarized.el
@@ -651,118 +651,45 @@ customize the resulting theme."
`(custom-button-unraised ((,class (:inherit underline))))
`(custom-button-pressed-unraised ((,class (:inherit custom-button-unraised :foreground ,magenta))))
;;;;; diff
- `(diff-added ((,class (:foreground ,green))))
- `(diff-changed ((,class (:foreground ,blue))))
- `(diff-removed ((,class (:foreground ,red))))
- `(diff-refine-added
- ((,light-class
- (:background ,(solarized-color-blend "#ddffdd" green 0.7)))
- (,dark-class
- (:background ,(solarized-color-blend "#446644" green 0.7)))))
- `(diff-refine-changed
- ((,light-class
- (:background ,(solarized-color-blend "#ddddff" blue 0.7)))
- (,dark-class
- (:background ,(solarized-color-blend "#444466" blue 0.7)))))
- `(diff-refine-removed
- ((,light-class
- (:background ,(solarized-color-blend "#ffdddd" red 0.7)))
- (,dark-class
- (:background ,(solarized-color-blend "#664444" red 0.7)))))
+ `(diff-added ((,class (:background ,green-lc :foreground ,base3 :weight normal :slant normal))))
+ `(diff-changed ((,class (:background ,yellow-lc :foreground ,base3 :weight normal :slant normal))))
+ `(diff-removed ((,class (:background ,orange-lc :foreground ,base3 :weight normal :slant normal))))
+ `(diff-refine-added ((,class (:foreground ,green-hc :underline t))))
+ `(diff-refine-changed ((,class (:foreground ,yellow-hc :underline t))))
+ `(diff-refine-removed ((,class (:foreground ,orange-hc :underline t))))
`(diff-header ((,class (:background ,base03))))
`(diff-file-header
((,class (:background ,base03 :foreground ,base0 :weight bold))))
;;;;; diff-hl
- `(diff-hl-change ((,class (:background ,blue-lc :foreground ,blue-hc))))
- `(diff-hl-delete ((,class (:background ,red-lc :foreground ,red-hc))))
- `(diff-hl-insert ((,class (:background ,green-lc :foreground ,green-hc))))
- `(diff-hl-unknown ((,class (:background ,cyan-lc :foreground ,cyan-hc))))
+ `(diff-hl-change ((,class (:background ,blue-lc :foreground ,blue-hc))))
+ `(diff-hl-delete ((,class (:background ,orange-lc :foreground ,orange-hc))))
+ `(diff-hl-insert ((,class (:background ,green-lc :foreground ,green-hc))))
+ `(diff-hl-unknown ((,class (:background ,yellow-lc :foreground ,yellow-hc))))
;;;;; 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 ,base01
- :foreground ,base3 ))))
- `(ediff-odd-diff-A ((,class (:background ,base01
- :foreground ,base03 ))))
- `(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 ))))
-
-;;;;;; alternative ediff (not finished)
- ;; `(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
- ;; ))))
+ `(ediff-fine-diff-A ((,class (:foreground ,orange-hc :underline t))))
+ `(ediff-fine-diff-B ((,class (:foreground ,green-hc :underline t))))
+ `(ediff-fine-diff-C ((,class (:foreground ,cyan-hc :underline t))))
+ `(ediff-fine-diff-Ancestor ((,class (:background ,green))))
+ `(ediff-current-diff-A ((,class (:background ,orange-lc :foreground ,base3 :weight normal :slant normal))))
+ `(ediff-current-diff-B ((,class (:background ,green-lc :foreground ,base3 :weight normal :slant normal))))
+ `(ediff-current-diff-C ((,class (:background ,cyan-lc :foreground ,base3 :weight normal :slant normal))))
+ `(ediff-current-diff-Ancestor ((,class (:background ,magenta :weight normal :slant normal))))
+ `(ediff-even-diff-A ((,class (:background ,base02 :foreground ,base3 :weight normal :slant normal))))
+ `(ediff-even-diff-B ((,class (:background ,base02 :foreground ,base3 :weight normal :slant normal))))
+ `(ediff-even-diff-C ((,class (:background ,base02 :foreground ,base3 :weight normal :slant normal))))
+ `(ediff-even-diff-Ancestor ((,class (:background ,(color-lighten-name base02 0.5) :weight normal :slant normal))))
+ `(ediff-odd-diff-A ((,class (:background ,base02 :foreground ,base3 :weight normal :slant normal))))
+ `(ediff-odd-diff-B ((,class (:background ,base02 :foreground ,base3 :weight normal :slant normal))))
+ `(ediff-odd-diff-C ((,class (:background ,base02 :foreground ,base3 :weight normal :slant normal))))
+ `(ediff-odd-diff-Ancestor ((,class (:background ,(color-lighten-name base02 0.5) :weight normal :slant normal))))
+;;;;;; smerge
+ `(smerge-markers ((,class (:background ,base02))))
+ `(smerge-base ((,class (:background ,yellow-lc :foreground ,base3 :weight normal :slant normal))))
+ `(smerge-mine ((,class (:background ,green-lc :foreground ,base3 :weight normal :slant normal))))
+ `(smerge-other ((,class (:background ,orange-lc :foreground ,base3 :weight normal :slant normal))))
+ `(smerge-refined-added ((,class (:foreground ,green-hc :underline t))))
+ `(smerge-refined-changed ((,class (:background ,blue-lc :foreground ,cyan-hc :underline t))))
+ `(smerge-refined-removed ((,class (:foreground ,orange-hc :underline t))))
;;;;; edts
`(edts-face-error-line
((,(append '((supports :underline (:style line))) light-class)
