branch: elpa/spacemacs-theme
commit 381bfe6004d5b66321cccd15ef7773aeb79ffcb9
Author: duianto <[email protected]>
Commit: duianto <[email protected]>
Use ediff-current-diff-A, -B, -C, bg non -s colors
---
spacemacs-common.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/spacemacs-common.el b/spacemacs-common.el
index 4c6a7aa876..24a367a287 100644
--- a/spacemacs-common.el
+++ b/spacemacs-common.el
@@ -310,10 +310,10 @@ to 'auto, tags may not be properly aligned. "
`(dired-warning ((,class (:foreground ,war))))
;;;;; ediff
- `(ediff-current-diff-A ((,class(:background ,red-bg-s :foreground ,red))))
+ `(ediff-current-diff-A ((,class(:background ,red-bg :foreground ,red))))
`(ediff-current-diff-Ancestor ((,class(:background ,aqua-bg :foreground
,aqua))))
- `(ediff-current-diff-B ((,class(:background ,green-bg-s :foreground
,green))))
- `(ediff-current-diff-C ((,class(:background ,blue-bg-s :foreground
,blue))))
+ `(ediff-current-diff-B ((,class(:background ,green-bg :foreground
,green))))
+ `(ediff-current-diff-C ((,class(:background ,blue-bg :foreground ,blue))))
`(ediff-even-diff-A ((,class(:background ,bg3))))
`(ediff-even-diff-Ancestor ((,class(:background ,bg3))))
`(ediff-even-diff-B ((,class(:background ,bg3))))
