[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/modus-themes ac9fd6d6b7 4/4: Use the semantic colour ma
From: |
ELPA Syncer |
Subject: |
[elpa] externals/modus-themes ac9fd6d6b7 4/4: Use the semantic colour mappings for search regexp groups |
Date: |
Thu, 14 Dec 2023 00:58:13 -0500 (EST) |
branch: externals/modus-themes
commit ac9fd6d6b784ca407fbf372fba6675f0a1cca080
Author: Protesilaos Stavrou <info@protesilaos.com>
Commit: Protesilaos Stavrou <info@protesilaos.com>
Use the semantic colour mappings for search regexp groups
---
modus-themes.el | 35 ++++++++++++++++++++++++-----------
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/modus-themes.el b/modus-themes.el
index 49a8e66755..8aebce30be 100644
--- a/modus-themes.el
+++ b/modus-themes.el
@@ -140,6 +140,14 @@ deficiency (deuteranopia or tritanopia, respectively)."
:version "30.1"
:group 'modus-themes-faces))
+(dotimes (n 4)
+ (custom-declare-face
+ (intern (format "modus-themes-search-rx-group-%s" n))
+ nil (format "Search regexp group number %s." n)
+ :package-version '(modus-themes . "4.4.0")
+ :version "30.1"
+ :group 'modus-themes-faces))
+
(dolist (scope '(code macro verbatim))
(custom-declare-face
(intern (format "modus-themes-prose-%s" scope))
@@ -1610,6 +1618,11 @@ FG and BG are the main colors."
`(modus-themes-search-current ((,c :background ,bg-search-current
:foreground ,fg-main)))
`(modus-themes-search-lazy ((,c :background ,bg-search-lazy :foreground
,fg-main)))
`(modus-themes-search-replace ((,c :background ,bg-search-replace
:foreground ,fg-main)))
+;;;;; search regexp groups
+ `(modus-themes-search-rx-group-0 ((,c :background ,bg-search-rx-group-0
:foreground ,fg-main)))
+ `(modus-themes-search-rx-group-1 ((,c :background ,bg-search-rx-group-1
:foreground ,fg-main)))
+ `(modus-themes-search-rx-group-2 ((,c :background ,bg-search-rx-group-2
:foreground ,fg-main)))
+ `(modus-themes-search-rx-group-3 ((,c :background ,bg-search-rx-group-3
:foreground ,fg-main)))
;;;;; completion frameworks
`(modus-themes-completion-match-0 ((,c ,@(modus-themes--completion-match
fg-completion-match-0 bg-completion-match-0))))
`(modus-themes-completion-match-1 ((,c ,@(modus-themes--completion-match
fg-completion-match-1 bg-completion-match-1))))
@@ -2702,8 +2715,8 @@ FG and BG are the main colors."
;;;;; isearch, occur, and the like
`(isearch ((,c :inherit modus-themes-search-current)))
`(isearch-fail ((,c :inherit modus-themes-prominent-error)))
- `(isearch-group-1 ((,c :inherit modus-themes-intense-blue)))
- `(isearch-group-2 ((,c :inherit modus-themes-intense-magenta)))
+ `(isearch-group-1 ((,c :inherit modus-themes-search-rx-group-0)))
+ `(isearch-group-2 ((,c :inherit modus-themes-search-rx-group-1)))
`(lazy-highlight ((,c :inherit modus-themes-search-lazy)))
`(match ((,c :background ,bg-magenta-subtle :foreground ,fg-main)))
`(query-replace ((,c :inherit modus-themes-search-replace)))
@@ -3446,10 +3459,10 @@ FG and BG are the main colors."
`(recursion-indicator-general ((,c :foreground ,modeline-err)))
`(recursion-indicator-minibuffer ((,c :foreground ,modeline-info)))
;;;;; regexp-builder (re-builder)
- `(reb-match-0 ((,c :inherit modus-themes-intense-cyan)))
- `(reb-match-1 ((,c :inherit modus-themes-subtle-magenta)))
- `(reb-match-2 ((,c :inherit modus-themes-subtle-green)))
- `(reb-match-3 ((,c :inherit modus-themes-intense-yellow)))
+ `(reb-match-0 ((,c :inherit modus-themes-search-rx-group-0)))
+ `(reb-match-1 ((,c :inherit modus-themes-search-rx-group-1)))
+ `(reb-match-2 ((,c :inherit modus-themes-search-rx-group-2)))
+ `(reb-match-3 ((,c :inherit modus-themes-search-rx-group-3)))
`(reb-regexp-grouping-backslash ((,c :inherit
font-lock-regexp-grouping-backslash)))
`(reb-regexp-grouping-construct ((,c :inherit
font-lock-regexp-grouping-construct)))
;;;;; rg (rg.el)
@@ -3824,11 +3837,11 @@ FG and BG are the main colors."
`(visible-mark-forward-face1 ((,c :background ,bg-magenta-intense)))
`(visible-mark-forward-face2 ((,c :background ,bg-green-intense)))
;;;;; visual-regexp
- `(vr/group-0 ((,c :inherit modus-themes-intense-blue)))
- `(vr/group-1 ((,c :inherit modus-themes-intense-magenta)))
- `(vr/group-2 ((,c :inherit modus-themes-intense-green)))
- `(vr/match-0 ((,c :inherit modus-themes-intense-yellow)))
- `(vr/match-1 ((,c :inherit modus-themes-intense-yellow)))
+ `(vr/group-0 ((,c :inherit modus-themes-search-rx-group-0)))
+ `(vr/group-1 ((,c :inherit modus-themes-search-rx-group-1)))
+ `(vr/group-2 ((,c :inherit modus-themes-search-rx-group-2)))
+ `(vr/match-0 ((,c :inherit modus-themes-search-current)))
+ `(vr/match-1 ((,c :inherit modus-themes-search-lazy)))
`(vr/match-separator-face ((,c :inherit bold :background ,bg-active)))
;;;;; vterm
;; NOTE 2023-08-10: `vterm-color-black' and `vterm-color-white'