[elpa] externals/modus-vivendi-theme 469b165 002/110: Add support for MAGIT-IMERGE

[Stefan Monnier]

branch: externals/modus-vivendi-theme
commit 469b1656a443820792dd8b25332825184f0af139
Author: Protesilaos Stavrou <address@hidden>
Commit: Protesilaos Stavrou <address@hidden>

    Add support for MAGIT-IMERGE
---
 README.org              | 1 +
 modus-operandi-theme.el | 3 +++
 modus-vivendi-theme.el  | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/README.org b/README.org
index de8ad81..5f06634 100644
--- a/README.org
+++ b/README.org
@@ -302,6 +302,7 @@ the "full support" may not be 100% true…
 + lsp-mode
 + lsp-ui
 + magit
++ magit-imerge
 + markdown-mode
 + markup-faces (=adoc-mode=)
 + mentor
diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el
index 13b7963..2261c93 100644
--- a/modus-operandi-theme.el
+++ b/modus-operandi-theme.el
@@ -179,6 +179,7 @@
 ;;     lsp-mode
 ;;     lsp-ui
 ;;     magit
+;;     magit-imerge
 ;;     markdown-mode
 ;;     markup-faces (`adoc-mode')
 ;;     mentor
@@ -1924,6 +1925,8 @@ between foreground and background is >= 7:1)."
    `(magit-signature-revoked ((,class (:background ,bg-main :foreground 
,magenta-intense))))
    `(magit-signature-untrusted ((,class (:background ,bg-main :foreground 
,cyan-intense))))
    `(magit-tag ((,class (:foreground ,yellow-alt-other))))
+   ;;;; magit-imerge
+   `(magit-imerge-overriding-value ((,class (:foreground ,red-alt :weight 
bold))))
    ;;;; markdown-mode
    `(markdown-blockquote-face ((,class (:background ,bg-dim :foreground 
,fg-special-warm :slant ,modus-theme-slant))))
    `(markdown-bold-face ((,class (:weight bold))))
diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el
index 76ab3bf..8bdd70d 100644
--- a/modus-vivendi-theme.el
+++ b/modus-vivendi-theme.el
@@ -179,6 +179,7 @@
 ;;     lsp-mode
 ;;     lsp-ui
 ;;     magit
+;;     magit-imerge
 ;;     markdown-mode
 ;;     markup-faces (`adoc-mode')
 ;;     mentor
@@ -1924,6 +1925,8 @@ between foreground and background is >= 7:1)."
    `(magit-signature-revoked ((,class (:background ,bg-main :foreground 
,magenta-intense))))
    `(magit-signature-untrusted ((,class (:background ,bg-main :foreground 
,cyan-intense))))
    `(magit-tag ((,class (:foreground ,yellow-alt-other))))
+   ;;;; magit-imerge
+   `(magit-imerge-overriding-value ((,class (:foreground ,red-alt :weight 
bold))))
    ;;;; markdown-mode
    `(markdown-blockquote-face ((,class (:background ,bg-dim :foreground 
,fg-special-warm :slant ,modus-theme-slant))))
    `(markdown-bold-face ((,class (:weight bold))))