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

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

[nongnu] elpa/spacemacs-theme 0d5782f3b1 280/336: Merge pull request #12


From: ELPA Syncer
Subject: [nongnu] elpa/spacemacs-theme 0d5782f3b1 280/336: Merge pull request #127 from duianto/patch-1
Date: Fri, 14 Jan 2022 10:59:45 -0500 (EST)

branch: elpa/spacemacs-theme
commit 0d5782f3b1a3d15465d3ca4abb04a8d831383527
Merge: c8faf7b5a7 af92db29a7
Author: Nasser Alshammari <designernasser@gmail.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #127 from duianto/patch-1
    
    Fix ediff-fine-diff-{A, B, C} colors
---
 spacemacs-common.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spacemacs-common.el b/spacemacs-common.el
index f5b60214b4..2153f9724f 100644
--- a/spacemacs-common.el
+++ b/spacemacs-common.el
@@ -318,10 +318,10 @@ to 'auto, tags may not be properly aligned. "
      `(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 :inherit bold))))
+     `(ediff-fine-diff-A ((,class(:background ,red :foreground ,bg1))))
      `(ediff-fine-diff-Ancestor ((,class(:background nil :inherit bold))))
-     `(ediff-fine-diff-B ((,class(:background nil :inherit bold))))
-     `(ediff-fine-diff-C ((,class(:background nil :inherit bold))))
+     `(ediff-fine-diff-B ((,class(:background ,green :foreground ,bg1))))
+     `(ediff-fine-diff-C ((,class(:background ,blue :foreground ,bg1))))
      `(ediff-odd-diff-A ((,class(:background ,bg4))))
      `(ediff-odd-diff-Ancestor ((,class(:background ,bg4))))
      `(ediff-odd-diff-B ((,class(:background ,bg4))))



reply via email to

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