branch: elpa/spacemacs-theme
commit 76921450e380b69cb9ee5f803ffca9e374c3bc68
Author: nashamri <[email protected]>
Commit: nashamri <[email protected]>
Fix ediff colors
Deleted sections are now shown in red and added sections are in green.
Thanks @nixmaniack :)
---
spacemacs-common.el | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/spacemacs-common.el b/spacemacs-common.el
index 2b621518e9..9332d14a89 100644
--- a/spacemacs-common.el
+++ b/spacemacs-common.el
@@ -195,18 +195,18 @@
`(dired-warning ((,class (:foreground ,war))))
;;;;; ediff
- `(ediff-current-diff-A ((,class(:background ,org-h1-bg :foreground
,inf))))
+ `(ediff-current-diff-A ((,class(:background ,red-bg :foreground ,red))))
`(ediff-current-diff-Ancestor ((,class(:background ,org-h2-bg :foreground
,str))))
- `(ediff-current-diff-B ((,class(:background ,org-h4-bg :foreground
,yellow))))
- `(ediff-current-diff-C ((,class(:background ,org-h3-bg :foreground
,green))))
+ `(ediff-current-diff-B ((,class(:background ,green-bg :foreground
,green))))
+ `(ediff-current-diff-C ((,class(:background ,org-h1-bg :foreground
,inf))))
`(ediff-even-diff-A ((,class(:background ,bg3))))
`(ediff-even-diff-Ancestor ((,class(:background ,bg3))))
`(ediff-even-diff-B ((,class(:background ,bg3))))
`(ediff-even-diff-C ((,class(:background ,bg3))))
- `(ediff-fine-diff-A ((,class(:background nil :bold t :underline t))))
- `(ediff-fine-diff-Ancestor ((,class(:background nil :bold t :underline
t))))
- `(ediff-fine-diff-B ((,class(:background nil :bold t :underline t))))
- `(ediff-fine-diff-C ((,class(:background nil :bold t :underline t))))
+ `(ediff-fine-diff-A ((,class(:background nil :bold t))))
+ `(ediff-fine-diff-Ancestor ((,class(:background nil :bold t))))
+ `(ediff-fine-diff-B ((,class(:background nil :bold t))))
+ `(ediff-fine-diff-C ((,class(:background nil :bold t))))
`(ediff-odd-diff-A ((,class(:background ,bg4))))
`(ediff-odd-diff-Ancestor ((,class(:background ,bg4))))
`(ediff-odd-diff-B ((,class(:background ,bg4))))
