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

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

[nongnu] elpa/inkpot-theme c23645020c 072/104: Add ediff color support


From: ELPA Syncer
Subject: [nongnu] elpa/inkpot-theme c23645020c 072/104: Add ediff color support
Date: Thu, 7 Jul 2022 12:01:21 -0400 (EDT)

branch: elpa/inkpot-theme
commit c23645020c1411860a3a2921ae9a14851ff4800b
Author: Campbell Barton <ideasman42@gmail.com>
Commit: Campbell Barton <ideasman42@gmail.com>

    Add ediff color support
---
 inkpot-theme.el | 18 ++++++++++++++++++
 readme.rst      |  1 +
 2 files changed, 19 insertions(+)

diff --git a/inkpot-theme.el b/inkpot-theme.el
index 61c0de119b..998d42eaa8 100644
--- a/inkpot-theme.el
+++ b/inkpot-theme.el
@@ -184,6 +184,24 @@
    `(diff-refine-added ((t (:background ,ip-green-mid))))
    `(diff-refine-removed ((t (:background ,ip-red-dark+0.2))))
 
+   ;; ediff-mode
+   `(ediff-current-diff-A ((t (:foreground ,ip-cream-light :background 
,ip-red-mid))))
+   `(ediff-current-diff-Ancestor ((t (:foreground ,ip-cream-light :background 
,ip-red-mid))))
+   `(ediff-current-diff-B ((t (:foreground ,ip-cream-light :background 
,ip-green-mid))))
+   `(ediff-current-diff-C ((t (:foreground ,ip-cream-light :background 
,ip-cyan-dark))))
+   `(ediff-even-diff-A ((t (:background ,ip-slate-dark+7.6))))
+   `(ediff-even-diff-Ancestor ((t (:background ,ip-slate-dark+7.6))))
+   `(ediff-even-diff-B ((t (:background ,ip-slate-dark+7.6))))
+   `(ediff-even-diff-C ((t (:background ,ip-slate-dark+7.6))))
+   `(ediff-fine-diff-A ((t (:foreground ,ip-cream-light :background 
,ip-red-light :weight bold))))
+   `(ediff-fine-diff-Ancestor ((t (:foreground ,ip-cream-light :background 
,ip-red-light weight bold))))
+   `(ediff-fine-diff-B ((t (:foreground ,ip-cream-light :background 
,ip-green-bright :weight bold))))
+   `(ediff-fine-diff-C ((t (:foreground ,ip-cream-light :background 
,ip-cyan-mid :weight bold ))))
+   `(ediff-odd-diff-A ((t (:background ,ip-slate-dark+15.7))))
+   `(ediff-odd-diff-Ancestor ((t (:background ,ip-slate-dark+15.7))))
+   `(ediff-odd-diff-B ((t (:background ,ip-slate-dark+15.7))))
+   `(ediff-odd-diff-C ((t (:background ,ip-slate-dark+15.7))))
+
    ;; dired-mode
    `(dired-directory ((t (:foreground ,ip-green-bright))))
    `(dired-header ((t (:foreground ,ip-orange-bright))))
diff --git a/readme.rst b/readme.rst
index 8733310ae3..9c52db4c0c 100644
--- a/readme.rst
+++ b/readme.rst
@@ -39,6 +39,7 @@ Markup Languages:
 
 Other:
    - ``diff-mode`` with refine colors for emacs 27+.
+   - ``ediff-mode``
 
 Bundled Packages:
    - ``which-func``



reply via email to

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