emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/spacemacs-theme fdf8efcb48 282/336: Merge pull request #12


From: ELPA Syncer
Subject: [nongnu] elpa/spacemacs-theme fdf8efcb48 282/336: Merge pull request #129 from duianto/patch-3
Date: Fri, 14 Jan 2022 10:59:45 -0500 (EST)

branch: elpa/spacemacs-theme
commit fdf8efcb48697dcb9e0e7d27133cef30007586b7
Merge: 0d5782f3b1 381bfe6004
Author: Nasser Alshammari <designernasser@gmail.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #129 from duianto/patch-3
    
    Unify ediff-current-diff-{A,B,C} background colors
---
 spacemacs-common.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spacemacs-common.el b/spacemacs-common.el
index 2153f9724f..bf873b0e66 100644
--- a/spacemacs-common.el
+++ b/spacemacs-common.el
@@ -310,9 +310,9 @@ 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-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))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]