branch: elpa/spacemacs-theme
commit 9da478668c80ed79d6ac0dcb2bd32626dd13a1f5
Author: Aaron L. Zeng <[email protected]>
Commit: Aaron L. Zeng <[email protected]>
Make diff-refine faces readable and compatible with font-lock
In particular, use background colors for both
diff-{added,changed,removed} and diff-refine-{added,changed,removed}.
Changing the former allows diff-font-lock-syntax to function correctly
and leave diffed code with proper syntax highlighting.
Change the diff-refine-* faces to use less harsh background
colors (those actually intended for background use are named *-bg*),
so that refined text is actually legible.
---
spacemacs-theme.el | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/spacemacs-theme.el b/spacemacs-theme.el
index 3cf28cbfea0..b1cee096272 100644
--- a/spacemacs-theme.el
+++ b/spacemacs-theme.el
@@ -314,17 +314,17 @@ to `auto', tags may not be properly aligned. "
`(corfu-current ((,class (:background ,ttip-sl :foreground ,base))))
;;;;; diff
- `(diff-added ((,class :background unspecified :foreground
,green :extend t)))
- `(diff-changed ((,class :background unspecified :foreground
,blue)))
+ `(diff-added ((,class :background ,green-bg :extend t)))
+ `(diff-changed ((,class :background ,blue-bg)))
`(diff-header ((,class :background ,cblk-ln-bg :foreground
,func :extend t)))
`(diff-file-header ((,class :background ,cblk-ln-bg :foreground
,cblk :extend t)))
- `(diff-indicator-added ((,class :background unspecified :foreground
,green :extend t)))
- `(diff-indicator-changed ((,class :background unspecified :foreground
,blue)))
- `(diff-indicator-removed ((,class :background unspecified :foreground
,red)))
- `(diff-refine-added ((,class :background ,green :foreground ,bg1)))
- `(diff-refine-changed ((,class :background ,blue :foreground ,bg1)))
- `(diff-refine-removed ((,class :background ,red :foreground ,bg1)))
- `(diff-removed ((,class :background unspecified :foreground
,red :extend t)))
+ `(diff-indicator-added ((,class :background ,green-bg :extend t)))
+ `(diff-indicator-changed ((,class :background ,blue-bg)))
+ `(diff-indicator-removed ((,class :background ,red-bg)))
+ `(diff-refine-added ((,class :background ,green-bg-s)))
+ `(diff-refine-changed ((,class :background ,blue-bg-s)))
+ `(diff-refine-removed ((,class :background ,red-bg-s)))
+ `(diff-removed ((,class :background ,red-bg :extend t)))
;;;;; diff-hl
`(diff-hl-insert ((,class :background ,green :foreground ,green)))
