[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``
- [nongnu] elpa/inkpot-theme 0173f2d80f 019/104: match vim for selected text, (continued)
- [nongnu] elpa/inkpot-theme 0173f2d80f 019/104: match vim for selected text, ELPA Syncer, 2022/07/07
- [nongnu] elpa/inkpot-theme d6a0255d52 021/104: Use brighter contrast for ivy selected item, ELPA Syncer, 2022/07/07
- [nongnu] elpa/inkpot-theme 046d0bb361 046/104: Add whitespace colors, ELPA Syncer, 2022/07/07
- [nongnu] elpa/inkpot-theme b6603694e1 060/104: Use line number color for xref mode, ELPA Syncer, 2022/07/07
- [nongnu] elpa/inkpot-theme c0b316a0dd 061/104: Cleanup: comments, ELPA Syncer, 2022/07/07
- [nongnu] elpa/inkpot-theme 141ff63129 028/104: Add highlight-indent-guides colors, ELPA Syncer, 2022/07/07
- [nongnu] elpa/inkpot-theme 56bf0523c0 056/104: Auto-format code, ELPA Syncer, 2022/07/07
- [nongnu] elpa/inkpot-theme 8b648afaaa 059/104: Update readme.rst, ELPA Syncer, 2022/07/07
- [nongnu] elpa/inkpot-theme bc5052ac11 048/104: readme.rst: minor edits, ELPA Syncer, 2022/07/07
- [nongnu] elpa/inkpot-theme 52fcb8ffc3 050/104: Support emacs 26+ 'display-line-numbers-mode', ELPA Syncer, 2022/07/07
- [nongnu] elpa/inkpot-theme c23645020c 072/104: Add ediff color support,
ELPA Syncer <=
- [nongnu] elpa/inkpot-theme 19d8c29f5c 074/104: Add extra font-lock faces for regex escaping, ELPA Syncer, 2022/07/07
- [nongnu] elpa/inkpot-theme 5d2f092100 080/104: Add colors for compilation mode, ELPA Syncer, 2022/07/07
- [nongnu] elpa/inkpot-theme c58bc89269 076/104: Add screenshots to the readme.rst, ELPA Syncer, 2022/07/07
- [nongnu] elpa/inkpot-theme 0c8b2024fe 083/104: Add theme colors `error` & `show-paren-mismatch`, ELPA Syncer, 2022/07/07
- [nongnu] elpa/inkpot-theme 7c3a0a76fa 084/104: Cleanup: use uppercase GVIM, ELPA Syncer, 2022/07/07
- [nongnu] elpa/inkpot-theme c3683aa99c 085/104: Add fancy-dabbrev mode colors, ELPA Syncer, 2022/07/07
- [nongnu] elpa/inkpot-theme a7afa500f9 090/104: Add mode-line-active, ELPA Syncer, 2022/07/07
- [nongnu] elpa/inkpot-theme 9afc537af6 091/104: readme: correct typo, ELPA Syncer, 2022/07/07
- [nongnu] elpa/inkpot-theme 59056ef2e8 104/104: Change URL to codeberg, ELPA Syncer, 2022/07/07
- [nongnu] elpa/inkpot-theme 55bff806ca 095/104: Cleanup: remove deprecated reference face, ELPA Syncer, 2022/07/07