[elpa] externals/ef-themes aadd680e8b 2/2: Implement bespoke mappings for rx grouping

[ELPA Syncer]

branch: externals/ef-themes
commit aadd680e8bc4f19eb4c05e0c72a743a7ccc09aa1
Author: Protesilaos Stavrou <info@protesilaos.com>
Commit: Protesilaos Stavrou <info@protesilaos.com>

    Implement bespoke mappings for rx grouping
    
    This give us full control over how backslashes and grouping constructs
    are compared to the string.  We want all three colours to be distinct.
---
 ef-autumn-theme.el             | 3 +++
 ef-dark-theme.el               | 3 +++
 ef-day-theme.el                | 3 +++
 ef-deuteranopia-dark-theme.el  | 3 +++
 ef-deuteranopia-light-theme.el | 3 +++
 ef-light-theme.el              | 3 +++
 ef-night-theme.el              | 3 +++
 ef-spring-theme.el             | 3 +++
 ef-summer-theme.el             | 3 +++
 ef-themes.el                   | 4 ++--
 ef-winter-theme.el             | 3 +++
 11 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/ef-autumn-theme.el b/ef-autumn-theme.el
index 2f26b9e65f..743ee154df 100644
--- a/ef-autumn-theme.el
+++ b/ef-autumn-theme.el
@@ -151,6 +151,9 @@
       (type green)
       (variable cyan-warmer)
 
+      (rx-escape green-cooler) ; compare with `string'
+      (rx-construct magenta-cooler)
+
       (accent-0 green-cooler)
       (accent-1 yellow-warmer)
       (accent-2 cyan-cooler)
diff --git a/ef-dark-theme.el b/ef-dark-theme.el
index f524a318ea..d336956ec7 100644
--- a/ef-dark-theme.el
+++ b/ef-dark-theme.el
@@ -151,6 +151,9 @@
       (type green-cooler)
       (variable cyan-cooler)
 
+      (rx-escape green-warmer) ; compare with `string'
+      (rx-construct red)
+
       (accent-0 blue)
       (accent-1 magenta-warmer)
       (accent-2 green-cooler)
diff --git a/ef-day-theme.el b/ef-day-theme.el
index f486dd566b..559423cf7e 100644
--- a/ef-day-theme.el
+++ b/ef-day-theme.el
@@ -151,6 +151,9 @@
       (type green-cooler)
       (variable magenta-cooler)
 
+      (rx-escape blue) ; compare with `string'
+      (rx-construct magenta-warmer)
+
       (accent-0 red)
       (accent-1 green-cooler)
       (accent-2 yellow)
diff --git a/ef-deuteranopia-dark-theme.el b/ef-deuteranopia-dark-theme.el
index dfa5174a26..0f98e91b78 100644
--- a/ef-deuteranopia-dark-theme.el
+++ b/ef-deuteranopia-dark-theme.el
@@ -154,6 +154,9 @@
       (type magenta-cooler)
       (variable cyan-cooler)
 
+      (rx-escape yellow-faint) ; compare with `string'
+      (rx-construct yellow-warmer)
+
       (accent-0 blue-cooler)
       (accent-1 yellow-warmer)
       (accent-2 cyan-warmer)
diff --git a/ef-deuteranopia-light-theme.el b/ef-deuteranopia-light-theme.el
index 0f14fff87a..a3d81ccb88 100644
--- a/ef-deuteranopia-light-theme.el
+++ b/ef-deuteranopia-light-theme.el
@@ -154,6 +154,9 @@
       (type yellow)
       (variable cyan-cooler)
 
+      (rx-escape cyan-faint) ; compare with `string'
+      (rx-construct blue-warmer)
+
       (accent-0 blue-cooler)
       (accent-1 yellow-warmer)
       (accent-2 cyan)
diff --git a/ef-light-theme.el b/ef-light-theme.el
index dd5ea37830..06398ce9ca 100644
--- a/ef-light-theme.el
+++ b/ef-light-theme.el
@@ -151,6 +151,9 @@
       (type green-cooler)
       (variable cyan-cooler)
 
+      (rx-escape green-cooler) ; compare with `string'
+      (rx-construct magenta)
+
       (accent-0 blue-warmer)
       (accent-1 magenta-warmer)
       (accent-2 green-cooler)
diff --git a/ef-night-theme.el b/ef-night-theme.el
index c44e86487b..f5810ee982 100644
--- a/ef-night-theme.el
+++ b/ef-night-theme.el
@@ -151,6 +151,9 @@
       (type magenta-cooler)
       (variable cyan-warmer)
 
+      (rx-escape green) ; compare with `string'
+      (rx-construct magenta-warmer)
+
       (accent-0 blue-cooler)
       (accent-1 magenta-warmer)
       (accent-2 cyan-cooler)
diff --git a/ef-spring-theme.el b/ef-spring-theme.el
index 488ea8f9e4..e29e71d515 100644
--- a/ef-spring-theme.el
+++ b/ef-spring-theme.el
@@ -151,6 +151,9 @@
       (type magenta-cooler)
       (variable cyan)
 
+      (rx-escape cyan) ; compare with `string'
+      (rx-construct magenta-warmer)
+
       (accent-0 green)
       (accent-1 red-cooler)
       (accent-2 blue)
diff --git a/ef-summer-theme.el b/ef-summer-theme.el
index 72675624e5..63d94c25cd 100644
--- a/ef-summer-theme.el
+++ b/ef-summer-theme.el
@@ -151,6 +151,9 @@
       (type cyan-warmer)
       (variable blue-warmer)
 
+      (rx-escape cyan-cooler) ; compare with `string'
+      (rx-construct red-cooler)
+
       (accent-0 magenta-cooler)
       (accent-1 yellow)
       (accent-2 cyan-cooler)
diff --git a/ef-themes.el b/ef-themes.el
index 830a8dad00..5f6eedbd8f 100644
--- a/ef-themes.el
+++ b/ef-themes.el
@@ -857,8 +857,8 @@ Helper function for `ef-themes-preview-colors'."
     `(font-lock-keyword-face ((,c :inherit bold :foreground ,keyword)))
     `(font-lock-negation-char-face ((,c :inherit bold)))
     `(font-lock-preprocessor-face ((,c :foreground ,preprocessor)))
-    `(font-lock-regexp-grouping-backslash ((,c :inherit bold :foreground 
,info)))
-    `(font-lock-regexp-grouping-construct ((,c :inherit bold :foreground 
,err)))
+    `(font-lock-regexp-grouping-backslash ((,c :inherit bold :foreground 
,rx-escape)))
+    `(font-lock-regexp-grouping-construct ((,c :inherit bold :foreground 
,rx-construct)))
     `(font-lock-string-face ((,c :foreground ,string)))
     `(font-lock-type-face ((,c :foreground ,type)))
     `(font-lock-variable-name-face ((,c :foreground ,variable)))
diff --git a/ef-winter-theme.el b/ef-winter-theme.el
index a0d22ab776..7dcd0d39e1 100644
--- a/ef-winter-theme.el
+++ b/ef-winter-theme.el
@@ -151,6 +151,9 @@
       (type cyan)
       (variable blue-warmer)
 
+      (rx-escape green) ; compare with `string'
+      (rx-construct blue)
+
       (accent-0 magenta-cooler)
       (accent-1 yellow)
       (accent-2 green-cooler)