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

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

[elpa] externals/ef-themes 4224ae4b6e: Make ediff faces work without imp


From: ELPA Syncer
Subject: [elpa] externals/ef-themes 4224ae4b6e: Make ediff faces work without implicit dependency on diff
Date: Thu, 18 May 2023 00:58:03 -0400 (EDT)

branch: externals/ef-themes
commit 4224ae4b6e3e04e1b5b5ab37b9b8e95de6a679d7
Author: Protesilaos Stavrou <info@protesilaos.com>
Commit: Protesilaos Stavrou <info@protesilaos.com>

    Make ediff faces work without implicit dependency on diff
    
    Thanks to goldfita for bringing this matter to my attention in issue
    20 on the GitHub mirror: 
<https://github.com/protesilaos/ef-themes/issues/20>.
---
 README.org   |  2 +-
 ef-themes.el | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.org b/README.org
index f8d2ba0b73..8413b053b8 100644
--- a/README.org
+++ b/README.org
@@ -1707,7 +1707,7 @@ matters.
   (zealotrush), Daniel Mendler, Federico Stilman, Iris Garcia,
   Jean-Philippe Gagné Guay, Jonas Collberg, Saša Janiška, Spike-Leung,
   Steve Molitor, Summer Emacs, Sven Seebeck, Thanos Apollo, Zoltán
-  Király.
+  Király, goldfita.
 
 * GNU Free Documentation License
 :PROPERTIES:
diff --git a/ef-themes.el b/ef-themes.el
index e3dbe95bf3..1a81ac9a65 100644
--- a/ef-themes.el
+++ b/ef-themes.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Ef-Themes Development <~protesilaos/ef-themes@lists.sr.ht>
 ;; URL: https://git.sr.ht/~protesilaos/ef-themes
 ;; Mailing-List: https://lists.sr.ht/~protesilaos/ef-themes
-;; Version: 1.0.0
+;; Version: 1.0.1
 ;; Package-Requires: ((emacs "27.1"))
 ;; Keywords: faces, theme, accessibility
 
@@ -1235,18 +1235,18 @@ Optional prefix argument MAPPINGS has the same meaning 
as for
     `(doom-modeline-urgent ((,c :inherit bold-italic :foreground 
,modeline-err)))
     `(doom-modeline-warning ((,c :inherit bold :foreground ,modeline-warning)))
 ;;;; ediff
-    `(ediff-current-diff-A ((,c :inherit diff-removed)))
-    `(ediff-current-diff-Ancestor ((,c :background ,bg-region))) ; TODO 
2022-08-14: Needs review
-    `(ediff-current-diff-B ((,c :inherit diff-added)))
-    `(ediff-current-diff-C ((,c :inherit diff-changed)))
+    `(ediff-current-diff-A ((,c :background ,bg-removed :foreground 
,fg-removed)))
+    `(ediff-current-diff-Ancestor ((,c :background ,bg-region)))
+    `(ediff-current-diff-B ((,c :background ,bg-added :foreground ,fg-added)))
+    `(ediff-current-diff-C ((,c :background ,bg-changed :foreground 
,fg-changed)))
     `(ediff-even-diff-A ((,c :background ,bg-dim)))
     `(ediff-even-diff-Ancestor ((,c :background ,bg-dim)))
     `(ediff-even-diff-B ((,c :background ,bg-dim)))
     `(ediff-even-diff-C ((,c :background ,bg-dim)))
-    `(ediff-fine-diff-A ((,c :inherit diff-refine-removed)))
-    `(ediff-fine-diff-Ancestor ((,c :inherit diff-refine-cyan)))
-    `(ediff-fine-diff-B ((,c :inherit diff-refine-added)))
-    `(ediff-fine-diff-C ((,c :inherit diff-refine-changed)))
+    `(ediff-fine-diff-A ((,c :background ,bg-removed-refine :foreground 
,fg-removed)))
+    `(ediff-fine-diff-Ancestor ((,c :inherit modus-themes-subtle-cyan)))
+    `(ediff-fine-diff-B ((,c :background ,bg-added-refine :foreground 
,fg-added)))
+    `(ediff-fine-diff-C ((,c :background ,bg-changed-refine :foreground 
,fg-changed)))
     `(ediff-odd-diff-A ((,c :inherit ediff-even-diff-A)))
     `(ediff-odd-diff-Ancestor ((,c :inherit ediff-even-diff-Ancestor)))
     `(ediff-odd-diff-B ((,c :inherit ediff-even-diff-B)))



reply via email to

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