branch: elpa/apropospriate-theme
commit faffb913744ce50f6baced46639b983d9749609e
Author: justin talbott <[email protected]>
Commit: justin talbott <[email protected]>
improve ediff support
closes https://github.com/waymondo/apropospriate-theme/issues/14
---
README.md | 1 +
apropospriate.el | 36 ++++++++++++++++--------------------
2 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/README.md b/README.md
index 07657fb..4c05e9d 100644
--- a/README.md
+++ b/README.md
@@ -111,3 +111,4 @@ Apropospriate supports all the usual `prog-mode` derived
packages as well as som
* Orderless
* Corfu
* Vertico
+* Ediff
diff --git a/apropospriate.el b/apropospriate.el
index 29d56b0..b3e2282 100644
--- a/apropospriate.el
+++ b/apropospriate.el
@@ -405,10 +405,6 @@ Set to `1.0' or nil to prevent font size manipulation."
`(diff-header ((,class (:background ,base00+1))))
`(diff-file-header ((,class (:foreground ,base01))))
`(diff-hunk-header ((,class (:foreground ,base01))))
- `(ediff-even-diff-A ((,class (:foreground nil :background nil
:inverse-video t))))
- `(ediff-even-diff-B ((,class (:foreground nil :background nil
:inverse-video t))))
- `(ediff-odd-diff-A ((,class ( :foreground ,base03 :background nil
:inverse-video t))))
- `(ediff-odd-diff-B ((,class ( :foreground ,base03 :background nil
:inverse-video t))))
`(git-gutter:added ((,class (:foreground ,base01))))
`(git-gutter:deleted ((,class (:foreground ,base01))))
`(git-gutter:modified ((,class (:foreground ,base01))))
@@ -500,22 +496,22 @@ Set to `1.0' or nil to prevent font size manipulation."
`(smerge-lower ((,class (:background ,base00-1))))
`(smerge-refined-removed ((,class (:foreground ,red :background
,base00-1))))
`(smerge-refined-added ((,class (:foreground ,green :background
,base00-1))))
- `(ediff-current-diff-A ((,class (:foreground ,base03 :background
,red-1))))
- `(ediff-current-diff-Ancestor ((,class (:foreground ,base03 :background
,red-1))))
- `(ediff-current-diff-B ((,class (:foreground ,base03 :background
,green-1))))
- `(ediff-current-diff-C ((,class (:foreground ,base03 :background
,blue-1))))
- `(ediff-even-diff-A ((,class (:background ,base00+2))))
- `(ediff-even-diff-Ancestor ((,class (:background ,base00+2))))
- `(ediff-even-diff-B ((,class (:background ,base00+2))))
- `(ediff-even-diff-C ((,class (:background ,base00+2))))
- `(ediff-fine-diff-A ((,class (:foreground ,base03 :background ,red-1))))
- `(ediff-fine-diff-Ancestor ((,class (:foreground ,base03 :background
,red-1))))
- `(ediff-fine-diff-B ((,class (:foreground ,base03 :background ,green-1))))
- `(ediff-fine-diff-C ((,class (:foreground ,base03 :background ,blue-1 ))))
- `(ediff-odd-diff-A ((,class (:background ,base01))))
- `(ediff-odd-diff-Ancestor ((,class (:background ,base01))))
- `(ediff-odd-diff-B ((,class (:background ,base01))))
- `(ediff-odd-diff-C ((,class (:background ,base01))))
+ `(ediff-current-diff-A ((,class (:background ,base00-2 :inverse-video nil
:extend t))))
+ `(ediff-current-diff-Ancestor ((,class (:inherit ediff-current-diff-A))))
+ `(ediff-current-diff-B ((,class (:inherit ediff-current-diff-A))))
+ `(ediff-current-diff-C ((,class (:inherit ediff-current-diff-A))))
+ `(ediff-fine-diff-A ((,class (:background ,base00 :stipple nil :extend
t))))
+ `(ediff-fine-diff-Ancestor ((,class (:inherit ediff-fine-diff-A))))
+ `(ediff-fine-diff-B ((,class (:inherit ediff-fine-diff-A))))
+ `(ediff-fine-diff-C ((,class (:inherit ediff-fine-diff-A ))))
+ `(ediff-even-diff-A ((,class (:background ,base00+1 :stipple nil :extend
t))))
+ `(ediff-even-diff-Ancestor ((,class (:inherit ediff-even-diff-A))))
+ `(ediff-even-diff-B ((,class (:inherit ediff-even-diff-A))))
+ `(ediff-even-diff-C ((,class (:inherit ediff-even-diff-A))))
+ `(ediff-odd-diff-A ((,class (:inherit ediff-even-diff-A))))
+ `(ediff-odd-diff-Ancestor ((,class (:inherit ediff-odd-diff-A))))
+ `(ediff-odd-diff-B ((,class (:inherit ediff-odd-diff-A))))
+ `(ediff-odd-diff-C ((,class (:inherit ediff-odd-diff-A))))
`(compilation-info ((,class (:foreground ,base02 :underline t))))
`(compilation-column-number ((,class (:foreground ,base02))))
`(compilation-line-number ((,class (:foreground ,base02))))
