[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/standard-themes f1a505e2aa: Make ediff faces not implic
|
From: |
ELPA Syncer |
|
Subject: |
[elpa] externals/standard-themes f1a505e2aa: Make ediff faces not implicitly depend on diff-mode |
|
Date: |
Tue, 23 May 2023 01:59:49 -0400 (EDT) |
branch: externals/standard-themes
commit f1a505e2aa66939af423ff7222abcc5decf64ed6
Author: Protesilaos Stavrou <info@protesilaos.com>
Commit: Protesilaos Stavrou <info@protesilaos.com>
Make ediff faces not implicitly depend on diff-mode
---
standard-themes.el | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/standard-themes.el b/standard-themes.el
index f8acda575f..07f9152c4f 100644
--- a/standard-themes.el
+++ b/standard-themes.el
@@ -1258,18 +1258,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)))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] externals/standard-themes f1a505e2aa: Make ediff faces not implicitly depend on diff-mode,
ELPA Syncer <=