branch: externals/ef-themes
commit 4695feba8064cf557e1cb5a75d71f4e44e77458f
Author: Protesilaos Stavrou <i...@protesilaos.com>
Commit: Protesilaos Stavrou <i...@protesilaos.com>
emacs: implement semantic colour mappings for search constructs
---
ef-arbutus-theme.el | 17 ++++++++++++++---
ef-autumn-theme.el | 31 ++++++++++++++++++++----------
ef-bio-theme.el | 31 ++++++++++++++++++++----------
ef-cherie-theme.el | 31 ++++++++++++++++++++----------
ef-cyprus-theme.el | 11 +++++++++++
ef-dark-theme.el | 21 ++++++++++++++++-----
ef-day-theme.el | 11 +++++++++++
ef-deuteranopia-dark-theme.el | 15 +++++++++++++--
ef-deuteranopia-light-theme.el | 11 +++++++++++
ef-duo-dark-theme.el | 15 +++++++++++++--
ef-duo-light-theme.el | 11 +++++++++++
ef-elea-dark-theme.el | 13 ++++++++++++-
ef-elea-light-theme.el | 15 +++++++++++++--
ef-frost-theme.el | 13 ++++++++++++-
ef-kassio-theme.el | 11 +++++++++++
ef-light-theme.el | 13 ++++++++++++-
ef-maris-dark-theme.el | 21 ++++++++++++++++-----
ef-maris-light-theme.el | 11 +++++++++++
ef-melissa-dark-theme.el | 37 +++++++++++++++++++++++-------------
ef-melissa-light-theme.el | 11 +++++++++++
ef-night-theme.el | 37 +++++++++++++++++++++++-------------
ef-rosa-theme.el | 27 ++++++++++++++++++--------
ef-spring-theme.el | 15 +++++++++++++--
ef-summer-theme.el | 11 +++++++++++
ef-symbiosis-theme.el | 25 +++++++++++++++++-------
ef-themes.el | 43 ++++++++++++++++++++++++++++++++----------
ef-trio-dark-theme.el | 31 ++++++++++++++++++++----------
ef-trio-light-theme.el | 13 ++++++++++++-
ef-tritanopia-dark-theme.el | 13 ++++++++++++-
ef-tritanopia-light-theme.el | 11 +++++++++++
ef-winter-theme.el | 31 ++++++++++++++++++++----------
31 files changed, 480 insertions(+), 127 deletions(-)
diff --git a/ef-arbutus-theme.el b/ef-arbutus-theme.el
index 59c32f146c..7203f90ecc 100644
--- a/ef-arbutus-theme.el
+++ b/ef-arbutus-theme.el
@@ -90,9 +90,9 @@
(bg-red-intense "#ff8f88")
(bg-green-intense "#96df80")
(bg-yellow-intense "#efbf00")
- (bg-blue-intense "#cfceff")
- (bg-magenta-intense "#df9fff")
- (bg-cyan-intense "#88cfd0")
+ (bg-blue-intense "#afbeff")
+ (bg-magenta-intense "#bf9fff")
+ (bg-cyan-intense "#88d4f0")
(bg-red-subtle "#ffc2bf")
(bg-green-subtle "#c4f2af")
@@ -242,6 +242,17 @@
(mail-subject red)
(mail-other red-warmer)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-autumn-theme.el b/ef-autumn-theme.el
index 288011d21a..9dce223f6d 100644
--- a/ef-autumn-theme.el
+++ b/ef-autumn-theme.el
@@ -87,18 +87,18 @@
;;; Basic hues for background values
- (bg-red-intense "#cd2f30")
- (bg-green-intense "#20a020")
- (bg-yellow-intense "#9a4f20")
- (bg-blue-intense "#3f43af")
- (bg-magenta-intense "#b04fcf")
- (bg-cyan-intense "#027080")
-
- (bg-red-subtle "#77002a")
+ (bg-red-intense "#b02930")
+ (bg-green-intense "#4a7000")
+ (bg-yellow-intense "#8f5040")
+ (bg-blue-intense "#4648d0")
+ (bg-magenta-intense "#804fd5")
+ (bg-cyan-intense "#2270be")
+
+ (bg-red-subtle "#72002a")
(bg-green-subtle "#00422a")
- (bg-yellow-subtle "#693200")
+ (bg-yellow-subtle "#603000")
(bg-blue-subtle "#242679")
- (bg-magenta-subtle "#611062")
+ (bg-magenta-subtle "#501f72")
(bg-cyan-subtle "#004065")
;;; Diffs
@@ -240,6 +240,17 @@
(mail-subject green-cooler)
(mail-other yellow)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-bio-theme.el b/ef-bio-theme.el
index 40f2b33b16..b49eab68d3 100644
--- a/ef-bio-theme.el
+++ b/ef-bio-theme.el
@@ -87,18 +87,18 @@
;;; Basic hues for background values
- (bg-red-intense "#bd1f30")
- (bg-green-intense "#20a020")
- (bg-yellow-intense "#845020")
- (bg-blue-intense "#2f439f")
- (bg-magenta-intense "#b04fcf")
- (bg-cyan-intense "#027080")
-
- (bg-red-subtle "#6a002a")
+ (bg-red-intense "#b02930")
+ (bg-green-intense "#407430")
+ (bg-yellow-intense "#8f5040")
+ (bg-blue-intense "#4648d0")
+ (bg-magenta-intense "#a04fc5")
+ (bg-cyan-intense "#2270be")
+
+ (bg-red-subtle "#72002a")
(bg-green-subtle "#00422a")
- (bg-yellow-subtle "#5a3000")
+ (bg-yellow-subtle "#603000")
(bg-blue-subtle "#242679")
- (bg-magenta-subtle "#50105a")
+ (bg-magenta-subtle "#501f72")
(bg-cyan-subtle "#004065")
;;; Diffs
@@ -240,6 +240,17 @@
(mail-subject blue)
(mail-other green-warmer)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-cherie-theme.el b/ef-cherie-theme.el
index 21e0d6d64e..6e9790b330 100644
--- a/ef-cherie-theme.el
+++ b/ef-cherie-theme.el
@@ -87,18 +87,18 @@
;;; Basic hues for background values
- (bg-red-intense "#bd1f30")
- (bg-green-intense "#20a020")
- (bg-yellow-intense "#847020")
- (bg-blue-intense "#3633b0")
- (bg-magenta-intense "#b04fcf")
- (bg-cyan-intense "#2270be")
-
- (bg-red-subtle "#6a002a")
+ (bg-red-intense "#b02930")
+ (bg-green-intense "#2a7140")
+ (bg-yellow-intense "#8f5040")
+ (bg-blue-intense "#4648d0")
+ (bg-magenta-intense "#804fd5")
+ (bg-cyan-intense "#2270cf")
+
+ (bg-red-subtle "#72002a")
(bg-green-subtle "#00422a")
- (bg-yellow-subtle "#5a3000")
+ (bg-yellow-subtle "#603000")
(bg-blue-subtle "#242679")
- (bg-magenta-subtle "#50105a")
+ (bg-magenta-subtle "#501f72")
(bg-cyan-subtle "#004065")
;;; Diffs
@@ -240,6 +240,17 @@
(mail-subject red)
(mail-other yellow-warmer)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-cyprus-theme.el b/ef-cyprus-theme.el
index 2a6cb4ebde..ab91bf80d6 100644
--- a/ef-cyprus-theme.el
+++ b/ef-cyprus-theme.el
@@ -240,6 +240,17 @@
(mail-subject yellow-warmer)
(mail-other green)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-dark-theme.el b/ef-dark-theme.el
index f66ce213e4..27305c7a74 100644
--- a/ef-dark-theme.el
+++ b/ef-dark-theme.el
@@ -87,18 +87,18 @@
;;; Basic hues for background values
- (bg-red-intense "#cd2f30")
- (bg-green-intense "#20a020")
+ (bg-red-intense "#b02930")
+ (bg-green-intense "#337133")
(bg-yellow-intense "#8f5040")
(bg-blue-intense "#4648d0")
- (bg-magenta-intense "#a050cf")
- (bg-cyan-intense "#2270be")
+ (bg-magenta-intense "#804fdd")
+ (bg-cyan-intense "#2270cf")
(bg-red-subtle "#72002a")
(bg-green-subtle "#00422a")
(bg-yellow-subtle "#603000")
(bg-blue-subtle "#242679")
- (bg-magenta-subtle "#5a105f")
+ (bg-magenta-subtle "#501f72")
(bg-cyan-subtle "#004065")
;;; Diffs
@@ -240,6 +240,17 @@
(mail-subject blue-cooler)
(mail-other cyan)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-day-theme.el b/ef-day-theme.el
index 2450bd5d84..5445989c6b 100644
--- a/ef-day-theme.el
+++ b/ef-day-theme.el
@@ -240,6 +240,17 @@
(mail-subject red-warmer)
(mail-other green-warmer)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-deuteranopia-dark-theme.el b/ef-deuteranopia-dark-theme.el
index 88600b2054..93987b8fd6 100644
--- a/ef-deuteranopia-dark-theme.el
+++ b/ef-deuteranopia-dark-theme.el
@@ -93,8 +93,8 @@
(bg-red-intense "#8d7f00")
(bg-green-intense "#afcf20")
(bg-yellow-intense "#5f5f00")
- (bg-blue-intense "#264fa0")
- (bg-magenta-intense "#6f6aff")
+ (bg-blue-intense "#266fd0")
+ (bg-magenta-intense "#6f60c0")
(bg-cyan-intense "#007fae")
(bg-red-subtle "#72002a")
@@ -243,6 +243,17 @@
(mail-subject cyan-cooler)
(mail-other cyan)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-magenta-intense)
+
+ (bg-search-rx-group-0 bg-cyan-intense)
+ (bg-search-rx-group-1 bg-magenta-intense)
+ (bg-search-rx-group-2 bg-blue-subtle)
+ (bg-search-rx-group-3 bg-yellow-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-deuteranopia-light-theme.el b/ef-deuteranopia-light-theme.el
index 94c0be8e7c..e901035835 100644
--- a/ef-deuteranopia-light-theme.el
+++ b/ef-deuteranopia-light-theme.el
@@ -249,6 +249,17 @@
(fg-space border)
(bg-space-err bg-yellow-intense)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-magenta-intense)
+
+ (bg-search-rx-group-0 bg-cyan-intense)
+ (bg-search-rx-group-1 bg-magenta-intense)
+ (bg-search-rx-group-2 bg-blue-subtle)
+ (bg-search-rx-group-3 bg-yellow-subtle)
+
;;;; Tab mappings
(bg-tab-bar bg-alt)
diff --git a/ef-duo-dark-theme.el b/ef-duo-dark-theme.el
index f7ce533490..bab0177d1c 100644
--- a/ef-duo-dark-theme.el
+++ b/ef-duo-dark-theme.el
@@ -91,7 +91,7 @@
;;; Basic hues for background values
(bg-red-intense "#cd2f30")
- (bg-green-intense "#20a020")
+ (bg-green-intense "#407720")
(bg-yellow-intense "#8f5040")
(bg-blue-intense "#4648d0")
(bg-magenta-intense "#b04fcf")
@@ -101,7 +101,7 @@
(bg-green-subtle "#00422a")
(bg-yellow-subtle "#603000")
(bg-blue-subtle "#242679")
- (bg-magenta-subtle "#5a105f")
+ (bg-magenta-subtle "#501f72")
(bg-cyan-subtle "#004065")
;;; Diffs
@@ -243,6 +243,17 @@
(mail-subject yellow-warmer)
(mail-other cyan-warmer)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-duo-light-theme.el b/ef-duo-light-theme.el
index 322fea1a25..bd9b2aa2ac 100644
--- a/ef-duo-light-theme.el
+++ b/ef-duo-light-theme.el
@@ -243,6 +243,17 @@
(mail-subject yellow-warmer)
(mail-other cyan)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-elea-dark-theme.el b/ef-elea-dark-theme.el
index 0372687ea2..807ea1c2f4 100644
--- a/ef-elea-dark-theme.el
+++ b/ef-elea-dark-theme.el
@@ -88,7 +88,7 @@
;;; Basic hues for background values
(bg-red-intense "#bd1f30")
- (bg-green-intense "#20a420")
+ (bg-green-intense "#408420")
(bg-yellow-intense "#847020")
(bg-blue-intense "#2f5f9f")
(bg-magenta-intense "#b05fcf")
@@ -240,6 +240,17 @@
(mail-subject green-cooler)
(mail-other green)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-elea-light-theme.el b/ef-elea-light-theme.el
index 6baa4d2e7c..fd6fd43f0e 100644
--- a/ef-elea-light-theme.el
+++ b/ef-elea-light-theme.el
@@ -88,11 +88,11 @@
;;; Basic hues for background values
(bg-red-intense "#ff8f88")
- (bg-green-intense "#96df80")
+ (bg-green-intense "#a6df80")
(bg-yellow-intense "#efbf00")
(bg-blue-intense "#cfceff")
(bg-magenta-intense "#df9fff")
- (bg-cyan-intense "#88cfd0")
+ (bg-cyan-intense "#88cbdc")
(bg-red-subtle "#f0c6bf")
(bg-green-subtle "#c4edaf")
@@ -240,6 +240,17 @@
(mail-subject green-cooler)
(mail-other green)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-frost-theme.el b/ef-frost-theme.el
index f3813e57ee..5542d31f2f 100644
--- a/ef-frost-theme.el
+++ b/ef-frost-theme.el
@@ -88,7 +88,7 @@
;;; Basic hues for background values
(bg-red-intense "#ff8f88")
- (bg-green-intense "#8adf80")
+ (bg-green-intense "#8adf90")
(bg-yellow-intense "#fac200")
(bg-blue-intense "#cbcfff")
(bg-magenta-intense "#df8fff")
@@ -240,6 +240,17 @@
(mail-subject blue-cooler)
(mail-other cyan)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-kassio-theme.el b/ef-kassio-theme.el
index 7adb1ad4bc..891186161c 100644
--- a/ef-kassio-theme.el
+++ b/ef-kassio-theme.el
@@ -240,6 +240,17 @@
(mail-subject blue)
(mail-other magenta-faint)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-light-theme.el b/ef-light-theme.el
index 20a04bc2ae..4f7660b060 100644
--- a/ef-light-theme.el
+++ b/ef-light-theme.el
@@ -88,7 +88,7 @@
;;; Basic hues for background values
(bg-red-intense "#ff8f88")
- (bg-green-intense "#8adf80")
+ (bg-green-intense "#9adf90")
(bg-yellow-intense "#fac200")
(bg-blue-intense "#cbcfff")
(bg-magenta-intense "#df8fff")
@@ -240,6 +240,17 @@
(mail-subject blue-cooler)
(mail-other cyan)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-maris-dark-theme.el b/ef-maris-dark-theme.el
index 168a742873..ab0560dbba 100644
--- a/ef-maris-dark-theme.el
+++ b/ef-maris-dark-theme.el
@@ -88,17 +88,17 @@
;;; Basic hues for background values
(bg-red-intense "#bd1f30")
- (bg-green-intense "#20a420")
+ (bg-green-intense "#107840")
(bg-yellow-intense "#847020")
(bg-blue-intense "#2f5f9f")
(bg-magenta-intense "#b05fcf")
- (bg-cyan-intense "#028099")
+ (bg-cyan-intense "#0280b9")
(bg-red-subtle "#6a102a")
(bg-green-subtle "#00522a")
- (bg-yellow-subtle "#5a4300")
- (bg-blue-subtle "#243689")
- (bg-magenta-subtle "#49245f")
+ (bg-yellow-subtle "#5a4000")
+ (bg-blue-subtle "#243788")
+ (bg-magenta-subtle "#422e6b")
(bg-cyan-subtle "#005065")
;;; Diffs
@@ -240,6 +240,17 @@
(mail-subject green-warmer)
(mail-other blue)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-maris-light-theme.el b/ef-maris-light-theme.el
index e8b773154f..38be28c7e7 100644
--- a/ef-maris-light-theme.el
+++ b/ef-maris-light-theme.el
@@ -240,6 +240,17 @@
(mail-subject green-warmer)
(mail-other blue)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-melissa-dark-theme.el b/ef-melissa-dark-theme.el
index 72883ae9cb..97c80b0452 100644
--- a/ef-melissa-dark-theme.el
+++ b/ef-melissa-dark-theme.el
@@ -87,19 +87,19 @@
;;; Basic hues for background values
- (bg-red-intense "#bd1f30")
- (bg-green-intense "#20a420")
- (bg-yellow-intense "#847020")
- (bg-blue-intense "#2f5f9f")
- (bg-magenta-intense "#b05fcf")
- (bg-cyan-intense "#028099")
-
- (bg-red-subtle "#70202a")
- (bg-green-subtle "#105d1a")
- (bg-yellow-subtle "#625000")
- (bg-blue-subtle "#143f84")
- (bg-magenta-subtle "#55407a")
- (bg-cyan-subtle "#30546f")
+ (bg-red-intense "#b02930")
+ (bg-green-intense "#4a7100")
+ (bg-yellow-intense "#8f5040")
+ (bg-blue-intense "#4648d0")
+ (bg-magenta-intense "#a04fc5")
+ (bg-cyan-intense "#2270cf")
+
+ (bg-red-subtle "#72002a")
+ (bg-green-subtle "#00422a")
+ (bg-yellow-subtle "#603000")
+ (bg-blue-subtle "#242679")
+ (bg-magenta-subtle "#501f72")
+ (bg-cyan-subtle "#004065")
;;; Diffs
@@ -240,6 +240,17 @@
(mail-subject green)
(mail-other yellow-cooler)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-melissa-light-theme.el b/ef-melissa-light-theme.el
index 15469ceb64..eb43a2a26d 100644
--- a/ef-melissa-light-theme.el
+++ b/ef-melissa-light-theme.el
@@ -240,6 +240,17 @@
(mail-subject green-warmer)
(mail-other yellow-cooler)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-night-theme.el b/ef-night-theme.el
index c238a60e70..489cf5f361 100644
--- a/ef-night-theme.el
+++ b/ef-night-theme.el
@@ -87,19 +87,19 @@
;;; Basic hues for background values
- (bg-red-intense "#cd2f30")
- (bg-green-intense "#20a020")
- (bg-yellow-intense "#904f30")
- (bg-blue-intense "#2f439f")
- (bg-magenta-intense "#b04fcf")
- (bg-cyan-intense "#027080")
-
- (bg-red-subtle "#6a002a")
- (bg-green-subtle "#00422a")
- (bg-yellow-subtle "#5a3000")
- (bg-blue-subtle "#242679")
- (bg-magenta-subtle "#50105a")
- (bg-cyan-subtle "#004065")
+ (bg-red-intense "#bd1f30")
+ (bg-green-intense "#107440")
+ (bg-yellow-intense "#847020")
+ (bg-blue-intense "#2f5f9f")
+ (bg-magenta-intense "#804fd5")
+ (bg-cyan-intense "#0280b9")
+
+ (bg-red-subtle "#6a102a")
+ (bg-green-subtle "#00522a")
+ (bg-yellow-subtle "#5a4000")
+ (bg-blue-subtle "#243788")
+ (bg-magenta-subtle "#422e6b")
+ (bg-cyan-subtle "#00506a")
;;; Diffs
@@ -240,6 +240,17 @@
(mail-subject cyan-cooler)
(mail-other cyan-warmer)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-rosa-theme.el b/ef-rosa-theme.el
index 7a490bf58e..fc6c4c02f8 100644
--- a/ef-rosa-theme.el
+++ b/ef-rosa-theme.el
@@ -88,18 +88,18 @@
;;; Basic hues for background values
(bg-red-intense "#bd1f30")
- (bg-green-intense "#20a420")
+ (bg-green-intense "#408420")
(bg-yellow-intense "#847020")
(bg-blue-intense "#2f5f9f")
- (bg-magenta-intense "#b05fcf")
+ (bg-magenta-intense "#905fdf")
(bg-cyan-intense "#028099")
- (bg-red-subtle "#70202a")
- (bg-green-subtle "#105d1a")
- (bg-yellow-subtle "#625000")
- (bg-blue-subtle "#143f84")
- (bg-magenta-subtle "#55407a")
- (bg-cyan-subtle "#30546f")
+ (bg-red-subtle "#6a102a")
+ (bg-green-subtle "#00522a")
+ (bg-yellow-subtle "#5a4000")
+ (bg-blue-subtle "#243788")
+ (bg-magenta-subtle "#422e6b")
+ (bg-cyan-subtle "#005065")
;;; Diffs
@@ -240,6 +240,17 @@
(mail-subject green-cooler)
(mail-other magenta-warmer)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-spring-theme.el b/ef-spring-theme.el
index aa4f544aa6..6a6c0e3363 100644
--- a/ef-spring-theme.el
+++ b/ef-spring-theme.el
@@ -88,11 +88,11 @@
;;; Basic hues for background values
(bg-red-intense "#ff8f88")
- (bg-green-intense "#6fdf30")
+ (bg-green-intense "#7fdda0")
(bg-yellow-intense "#efcf00")
(bg-blue-intense "#afdfff")
(bg-magenta-intense "#df8fff")
- (bg-cyan-intense "#88cfe0")
+ (bg-cyan-intense "#80caf0")
(bg-red-subtle "#ffcfbf")
(bg-green-subtle "#afffbf")
@@ -240,6 +240,17 @@
(mail-subject cyan)
(mail-other cyan-cooler)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-summer-theme.el b/ef-summer-theme.el
index 8ce8ff0225..14ebffdc3f 100644
--- a/ef-summer-theme.el
+++ b/ef-summer-theme.el
@@ -240,6 +240,17 @@
(mail-subject magenta-cooler)
(mail-other magenta)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-symbiosis-theme.el b/ef-symbiosis-theme.el
index 4bb91426de..790dd88015 100644
--- a/ef-symbiosis-theme.el
+++ b/ef-symbiosis-theme.el
@@ -87,18 +87,18 @@
;;; Basic hues for background values
- (bg-red-intense "#cd2f30")
- (bg-green-intense "#20a020")
- (bg-yellow-intense "#706310")
- (bg-blue-intense "#2641a0")
- (bg-magenta-intense "#a050cf")
- (bg-cyan-intense "#2270be")
+ (bg-red-intense "#b02930")
+ (bg-green-intense "#4a7100")
+ (bg-yellow-intense "#8f5040")
+ (bg-blue-intense "#4648d0")
+ (bg-magenta-intense "#804fdf")
+ (bg-cyan-intense "#2270cf")
(bg-red-subtle "#72002a")
(bg-green-subtle "#00422a")
(bg-yellow-subtle "#603000")
(bg-blue-subtle "#242679")
- (bg-magenta-subtle "#5a105f")
+ (bg-magenta-subtle "#501f72")
(bg-cyan-subtle "#004065")
;;; Diffs
@@ -240,6 +240,17 @@
(mail-subject magenta-cooler)
(mail-other blue-warmer)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-themes.el b/ef-themes.el
index 71e9a92429..93a15892d9 100644
--- a/ef-themes.el
+++ b/ef-themes.el
@@ -824,6 +824,22 @@ text should not be underlined as well) yet still blend in."
:package-version '(ef-themes . "0.9.0")
:group 'ef-themes-faces))
+;; This produces `ef-themes-search-current' and the like
+(dolist (scope '(current lazy replace))
+ (custom-declare-face
+ (intern (format "ef-themes-search-%s" scope))
+ nil (format "Search of type %s." scope)
+ :package-version '(ef-themes . "1.5.0")
+ :group 'ef-themes-faces))
+
+;; This produces `ef-themes-search-rx-group-0' and the like
+(dotimes (n 4)
+ (custom-declare-face
+ (intern (format "ef-themes-search-rx-group-%s" n))
+ nil (format "Search regexp group number %s." n)
+ :package-version '(ef-themes . "1.5.0")
+ :group 'ef-themes-faces))
+
(defconst ef-themes-faces
'(
;;;; internal faces
@@ -842,6 +858,13 @@ text should not be underlined as well) yet still blend in."
`(ef-themes-mark-delete ((,c :inherit error :background ,bg-err)))
`(ef-themes-mark-select ((,c :inherit success :background ,bg-info)))
`(ef-themes-mark-other ((,c :inherit warning :background ,bg-warning)))
+ `(ef-themes-search-current ((,c :background ,bg-search-current :foreground
,fg-intense)))
+ `(ef-themes-search-lazy ((,c :background ,bg-search-lazy :foreground
,fg-intense)))
+ `(ef-themes-search-replace ((,c :background ,bg-search-replace :foreground
,fg-intense)))
+ `(ef-themes-search-rx-group-0 ((,c :background ,bg-search-rx-group-0
:foreground ,fg-intense)))
+ `(ef-themes-search-rx-group-1 ((,c :background ,bg-search-rx-group-1
:foreground ,fg-intense)))
+ `(ef-themes-search-rx-group-2 ((,c :background ,bg-search-rx-group-2
:foreground ,fg-intense)))
+ `(ef-themes-search-rx-group-3 ((,c :background ,bg-search-rx-group-3
:foreground ,fg-intense)))
`(ef-themes-underline-error ((,c :underline (:style wave :color
,underline-err))))
`(ef-themes-underline-info ((,c :underline (:style wave :color
,underline-info))))
`(ef-themes-underline-warning ((,c :underline (:style wave :color
,underline-warning))))
@@ -1544,13 +1567,13 @@ text should not be underlined as well) yet still blend
in."
`(info-title-3 ((,c :inherit ef-themes-heading-3)))
`(info-title-4 ((,c :inherit ef-themes-heading-4)))
;;;; isearch, occur, and the like
- `(isearch ((,c :background ,bg-yellow-intense :foreground ,fg-intense)))
- `(isearch-fail ((,c :background ,bg-red-intense :foreground ,fg-intense)))
- `(isearch-group-1 ((,c :background ,bg-green-intense :foreground
,fg-intense)))
- `(isearch-group-2 ((,c :background ,bg-magenta-intense :foreground
,fg-intense)))
- `(lazy-highlight ((,c :background ,bg-blue-intense :foreground
,fg-intense)))
+ `(isearch ((,c :inherit ef-themes-search-current)))
+ `(isearch-fail ((,c :inherit error :background ,bg-err :foreground ,err)))
+ `(isearch-group-1 ((,c :inherit ef-themes-search-rx-group-0)))
+ `(isearch-group-2 ((,c :inherit ef-themes-search-rx-group-1)))
+ `(lazy-highlight ((,c :inherit ef-themes-search-lazy)))
`(match ((,c :background ,bg-warning)))
- `(query-replace ((,c :background ,bg-red-intense :foreground ,fg-intense)))
+ `(query-replace ((,c :inherit ef-themes-search-replace)))
;;;; jit-spell
`(jit-spell-misspelling ((,c :inherit ef-themes-underline-error)))
;;;; jinx
@@ -2087,10 +2110,10 @@ text should not be underlined as well) yet still blend
in."
`(recursion-indicator-general ((,c :foreground ,modeline-err)))
`(recursion-indicator-minibuffer ((,c :foreground ,modeline-info)))
;;;; regexp-builder (re-builder)
- `(reb-match-0 ((,c :background ,bg-cyan-intense :foreground ,fg-intense)))
- `(reb-match-1 ((,c :background ,bg-red-intense :foreground ,fg-intense)))
- `(reb-match-2 ((,c :background ,bg-magenta-intense :foreground
,fg-intense)))
- `(reb-match-3 ((,c :background ,bg-yellow-intense :foreground
,fg-intense)))
+ `(reb-match-0 ((,c :inherit ef-themes-search-rx-group-0)))
+ `(reb-match-1 ((,c :inherit ef-themes-search-rx-group-1)))
+ `(reb-match-2 ((,c :inherit ef-themes-search-rx-group-2)))
+ `(reb-match-3 ((,c :inherit ef-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)))
;;;; rst-mode
diff --git a/ef-trio-dark-theme.el b/ef-trio-dark-theme.el
index 41c7961de3..194dba4afb 100644
--- a/ef-trio-dark-theme.el
+++ b/ef-trio-dark-theme.el
@@ -87,18 +87,18 @@
;;; Basic hues for background values
- (bg-red-intense "#bd1f30")
- (bg-green-intense "#20a020")
- (bg-yellow-intense "#845020")
- (bg-blue-intense "#3633b0")
- (bg-magenta-intense "#b04fcf")
- (bg-cyan-intense "#2270be")
-
- (bg-red-subtle "#6a002a")
+ (bg-red-intense "#b02930")
+ (bg-green-intense "#2a7140")
+ (bg-yellow-intense "#8f5040")
+ (bg-blue-intense "#4648d0")
+ (bg-magenta-intense "#804fd5")
+ (bg-cyan-intense "#2270cf")
+
+ (bg-red-subtle "#72002a")
(bg-green-subtle "#00422a")
- (bg-yellow-subtle "#5a3000")
+ (bg-yellow-subtle "#603000")
(bg-blue-subtle "#242679")
- (bg-magenta-subtle "#50105a")
+ (bg-magenta-subtle "#501f72")
(bg-cyan-subtle "#004065")
;;; Diffs
@@ -240,6 +240,17 @@
(mail-subject magenta)
(mail-other cyan)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-trio-light-theme.el b/ef-trio-light-theme.el
index 9f253c2716..13dda81bfd 100644
--- a/ef-trio-light-theme.el
+++ b/ef-trio-light-theme.el
@@ -88,7 +88,7 @@
;;; Basic hues for background values
(bg-red-intense "#ff7f88")
- (bg-green-intense "#86df80")
+ (bg-green-intense "#7fdda0")
(bg-yellow-intense "#ffc200")
(bg-blue-intense "#cbcfff")
(bg-magenta-intense "#df8fff")
@@ -240,6 +240,17 @@
(mail-subject magenta)
(mail-other cyan)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-tritanopia-dark-theme.el b/ef-tritanopia-dark-theme.el
index 8710dcc08f..923b57b6cf 100644
--- a/ef-tritanopia-dark-theme.el
+++ b/ef-tritanopia-dark-theme.el
@@ -94,7 +94,7 @@
(bg-green-intense "#5f806f")
(bg-yellow-intense "#950f4f")
(bg-blue-intense "#165f70")
- (bg-magenta-intense "#b07faf")
+ (bg-magenta-intense "#a04f9f")
(bg-cyan-intense "#007faa")
(bg-red-subtle "#72002a")
@@ -243,6 +243,17 @@
(mail-subject red-warmer)
(mail-other magenta-cooler)
+;;;; Search mappings
+
+ (bg-search-current bg-red-intense)
+ (bg-search-lazy bg-cyan-intense)
+ (bg-search-replace bg-magenta-intense)
+
+ (bg-search-rx-group-0 bg-blue-intense)
+ (bg-search-rx-group-1 bg-magenta-intense)
+ (bg-search-rx-group-2 bg-cyan-subtle)
+ (bg-search-rx-group-3 bg-red-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-tritanopia-light-theme.el b/ef-tritanopia-light-theme.el
index 09f42e3c33..c111b8f777 100644
--- a/ef-tritanopia-light-theme.el
+++ b/ef-tritanopia-light-theme.el
@@ -243,6 +243,17 @@
(mail-subject red-warmer)
(mail-other magenta-cooler)
+;;;; Search mappings
+
+ (bg-search-current bg-red-intense)
+ (bg-search-lazy bg-cyan-intense)
+ (bg-search-replace bg-magenta-intense)
+
+ (bg-search-rx-group-0 bg-blue-intense)
+ (bg-search-rx-group-1 bg-magenta-intense)
+ (bg-search-rx-group-2 bg-cyan-subtle)
+ (bg-search-rx-group-3 bg-red-subtle)
+
;;;; Space mappings
(bg-space unspecified)
diff --git a/ef-winter-theme.el b/ef-winter-theme.el
index bf76d13b1f..6de01b9695 100644
--- a/ef-winter-theme.el
+++ b/ef-winter-theme.el
@@ -87,18 +87,18 @@
;;; Basic hues for background values
- (bg-red-intense "#bd1f30")
- (bg-green-intense "#20a020")
- (bg-yellow-intense "#845020")
- (bg-blue-intense "#3633b0")
- (bg-magenta-intense "#b04fcf")
- (bg-cyan-intense "#2270be")
-
- (bg-red-subtle "#6a002a")
+ (bg-red-intense "#b02930")
+ (bg-green-intense "#0a7040")
+ (bg-yellow-intense "#8f5040")
+ (bg-blue-intense "#4648d0")
+ (bg-magenta-intense "#a04fc5")
+ (bg-cyan-intense "#2270cf")
+
+ (bg-red-subtle "#72002a")
(bg-green-subtle "#00422a")
- (bg-yellow-subtle "#5a3000")
+ (bg-yellow-subtle "#603000")
(bg-blue-subtle "#242679")
- (bg-magenta-subtle "#50105a")
+ (bg-magenta-subtle "#501f72")
(bg-cyan-subtle "#004065")
;;; Diffs
@@ -240,6 +240,17 @@
(mail-subject blue-warmer)
(mail-other magenta-cooler)
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-blue-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
;;;; Space mappings
(bg-space unspecified)
