[nongnu] elpa/gruvbox-theme 0013c68458 250/258: new ediff faces that retain syntax highlighting

[ELPA Syncer]

branch: elpa/gruvbox-theme
commit 0013c68458ae62fe1dc4bbbb23f6a54a9d41e398
Author: ssnnoo <43703153+ssnnoo@users.noreply.github.com>
Commit: Jason Milkins <jasonm23@users.noreply.github.com>

    new ediff faces that retain syntax highlighting
---
 gruvbox-dark-hard-theme.el    |  9 +++++++++
 gruvbox-dark-medium-theme.el  |  9 +++++++++
 gruvbox-dark-soft-theme.el    |  9 +++++++++
 gruvbox-light-hard-theme.el   |  9 +++++++++
 gruvbox-light-medium-theme.el |  9 +++++++++
 gruvbox-light-soft-theme.el   |  9 +++++++++
 gruvbox-theme.el              |  9 +++++++++
 gruvbox.el                    | 17 +++++++++--------
 8 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/gruvbox-dark-hard-theme.el b/gruvbox-dark-hard-theme.el
index 9d4041720a..c6cd7c9ff2 100644
--- a/gruvbox-dark-hard-theme.el
+++ b/gruvbox-dark-hard-theme.el
@@ -114,6 +114,15 @@
   (gruvbox-aquamarine4     "#83A598" "#87af87")
   (gruvbox-turquoise4      "#61ACBB" "#5fafaf")
 
+  (gruvbox-ediff-current-diff-A        "#4f2121" "#4f2121")
+  (gruvbox-ediff-current-diff-B        "#243c24" "#5f5f00")
+  (gruvbox-ediff-current-diff-C        "#4f214f" "#4f214f")
+  (gruvbox-ediff-current-diff-Ancestor "#21214f" "#21214f")
+  (gruvbox-ediff-fine-diff-A           "#761919" "#761919")
+  (gruvbox-ediff-fine-diff-B           "#1c691c" "#1c691c")
+  (gruvbox-ediff-fine-diff-C           "#761976" "#761976")
+  (gruvbox-ediff-fine-diff-Ancestor    "#12129d" "#12129d")
+
   (gruvbox-bg gruvbox-dark0_hard)
   (gruvbox-bg_inactive gruvbox-dark0)
   )
diff --git a/gruvbox-dark-medium-theme.el b/gruvbox-dark-medium-theme.el
index 46e0e8cb23..c048770997 100644
--- a/gruvbox-dark-medium-theme.el
+++ b/gruvbox-dark-medium-theme.el
@@ -114,6 +114,15 @@
   (gruvbox-aquamarine4     "#83A598" "#87af87")
   (gruvbox-turquoise4      "#61ACBB" "#5fafaf")
 
+  (gruvbox-ediff-current-diff-A        "#4f2121" "#4f2121")
+  (gruvbox-ediff-current-diff-B        "#243c24" "#5f5f00")
+  (gruvbox-ediff-current-diff-C        "#4f214f" "#4f214f")
+  (gruvbox-ediff-current-diff-Ancestor "#21214f" "#21214f")
+  (gruvbox-ediff-fine-diff-A           "#761919" "#761919")
+  (gruvbox-ediff-fine-diff-B           "#1c691c" "#1c691c")
+  (gruvbox-ediff-fine-diff-C           "#761976" "#761976")
+  (gruvbox-ediff-fine-diff-Ancestor    "#12129d" "#12129d")
+
   (gruvbox-bg gruvbox-dark0)
   (gruvbox-bg_inactive gruvbox-dark0_soft)
   )
diff --git a/gruvbox-dark-soft-theme.el b/gruvbox-dark-soft-theme.el
index b87ce3d588..40437d82c7 100644
--- a/gruvbox-dark-soft-theme.el
+++ b/gruvbox-dark-soft-theme.el
@@ -114,6 +114,15 @@
   (gruvbox-aquamarine4     "#83A598" "#87af87")
   (gruvbox-turquoise4      "#61ACBB" "#5fafaf")
 
+  (gruvbox-ediff-current-diff-A        "#4f2121" "#4f2121")
+  (gruvbox-ediff-current-diff-B        "#243c24" "#5f5f00")
+  (gruvbox-ediff-current-diff-C        "#4f214f" "#4f214f")
+  (gruvbox-ediff-current-diff-Ancestor "#21214f" "#21214f")
+  (gruvbox-ediff-fine-diff-A           "#761919" "#761919")
+  (gruvbox-ediff-fine-diff-B           "#1c691c" "#1c691c")
+  (gruvbox-ediff-fine-diff-C           "#761976" "#761976")
+  (gruvbox-ediff-fine-diff-Ancestor    "#12129d" "#12129d")
+
   (gruvbox-bg gruvbox-dark0_soft)
   (gruvbox-bg_inactive gruvbox-dark1)
   )
diff --git a/gruvbox-light-hard-theme.el b/gruvbox-light-hard-theme.el
index e268360776..bdefd79441 100644
--- a/gruvbox-light-hard-theme.el
+++ b/gruvbox-light-hard-theme.el
@@ -114,6 +114,15 @@
   (gruvbox-aquamarine4     "#83A598" "#87af87")
   (gruvbox-turquoise4      "#61ACBB" "#5fafaf")
 
+  (gruvbox-ediff-current-diff-A        "#fbc6a3" "#fbc6a3")
+  (gruvbox-ediff-current-diff-B        "#e3f3b5" "#e3f3b5")
+  (gruvbox-ediff-current-diff-C        "#fadccc" "#fadccc")
+  (gruvbox-ediff-current-diff-Ancestor "#ccc6d1" "#ccc6d1")
+  (gruvbox-ediff-fine-diff-A           "#fbb091" "#fbb091")
+  (gruvbox-ediff-fine-diff-B           "#b6f691" "#b6f691")
+  (gruvbox-ediff-fine-diff-C           "#fbb0d6" "#fbb0d6")
+  (gruvbox-ediff-fine-diff-Ancestor    "#b6b0d6" "#b6b0d6")
+
   (gruvbox-bg gruvbox-dark0_hard)
   (gruvbox-bg_inactive gruvbox-dark0)
   )
diff --git a/gruvbox-light-medium-theme.el b/gruvbox-light-medium-theme.el
index 7f6112665f..594cdd2133 100644
--- a/gruvbox-light-medium-theme.el
+++ b/gruvbox-light-medium-theme.el
@@ -114,6 +114,15 @@
   (gruvbox-aquamarine4     "#83A598" "#87af87")
   (gruvbox-turquoise4      "#61ACBB" "#5fafaf")
 
+  (gruvbox-ediff-current-diff-A        "#fbc6a3" "#fbc6a3")
+  (gruvbox-ediff-current-diff-B        "#e3f3b5" "#e3f3b5")
+  (gruvbox-ediff-current-diff-C        "#fadccc" "#fadccc")
+  (gruvbox-ediff-current-diff-Ancestor "#ccc6d1" "#ccc6d1")
+  (gruvbox-ediff-fine-diff-A           "#fbb091" "#fbb091")
+  (gruvbox-ediff-fine-diff-B           "#b6f691" "#b6f691")
+  (gruvbox-ediff-fine-diff-C           "#fbb0d6" "#fbb0d6")
+  (gruvbox-ediff-fine-diff-Ancestor    "#b6b0d6" "#b6b0d6")
+
   (gruvbox-bg gruvbox-dark0)
   (gruvbox-bg_inactive gruvbox-dark0_soft)
   )
diff --git a/gruvbox-light-soft-theme.el b/gruvbox-light-soft-theme.el
index d68a476b35..4c6c8376f9 100644
--- a/gruvbox-light-soft-theme.el
+++ b/gruvbox-light-soft-theme.el
@@ -115,6 +115,15 @@
   (gruvbox-aquamarine4     "#83A598" "#87af87")
   (gruvbox-turquoise4      "#61ACBB" "#5fafaf")
 
+  (gruvbox-ediff-current-diff-A        "#fbc6a3" "#fbc6a3")
+  (gruvbox-ediff-current-diff-B        "#e3f3b5" "#e3f3b5")
+  (gruvbox-ediff-current-diff-C        "#fadccc" "#fadccc")
+  (gruvbox-ediff-current-diff-Ancestor "#ccc6d1" "#ccc6d1")
+  (gruvbox-ediff-fine-diff-A           "#fbb091" "#fbb091")
+  (gruvbox-ediff-fine-diff-B           "#b6f691" "#b6f691")
+  (gruvbox-ediff-fine-diff-C           "#fbb0d6" "#fbb0d6")
+  (gruvbox-ediff-fine-diff-Ancestor    "#b6b0d6" "#b6b0d6")
+
   (gruvbox-bg gruvbox-dark0_soft)
   (gruvbox-bg_inactive gruvbox-dark1)
   )
diff --git a/gruvbox-theme.el b/gruvbox-theme.el
index 6a9bbcc17c..fb2f7ca012 100644
--- a/gruvbox-theme.el
+++ b/gruvbox-theme.el
@@ -114,6 +114,15 @@
   (gruvbox-aquamarine4     "#83A598" "#87af87")
   (gruvbox-turquoise4      "#61ACBB" "#5fafaf")
 
+  (gruvbox-ediff-current-diff-A        "#fbc6a3" "#fbc6a3")
+  (gruvbox-ediff-current-diff-B        "#e3f3b5" "#e3f3b5")
+  (gruvbox-ediff-current-diff-C        "#fadccc" "#fadccc")
+  (gruvbox-ediff-current-diff-Ancestor "#ccc6d1" "#ccc6d1")
+  (gruvbox-ediff-fine-diff-A           "#fbb091" "#fbb091")
+  (gruvbox-ediff-fine-diff-B           "#b6f691" "#b6f691")
+  (gruvbox-ediff-fine-diff-C           "#fbb0d6" "#fbb0d6")
+  (gruvbox-ediff-fine-diff-Ancestor    "#b6b0d6" "#b6b0d6")
+
   (gruvbox-bg gruvbox-dark0)
   (gruvbox-bg_inactive gruvbox-dark0_soft)
   )
diff --git a/gruvbox.el b/gruvbox.el
index 7ba16420a8..5f0f0e6fa8 100644
--- a/gruvbox.el
+++ b/gruvbox.el
@@ -206,14 +206,15 @@ Should contain 2 %s constructs to allow for theme name 
and directory/prefix")
      (ediff-odd-diff-B                          (:background gruvbox-dark2))
      (ediff-odd-diff-C                          (:background gruvbox-dark2))
      (ediff-odd-diff-Ancestor                   (:background gruvbox-dark2))
-     (ediff-fine-diff-A                         (:background 
gruvbox-neutral_yellow :foreground gruvbox-dark0))
-     (ediff-fine-diff-Ancestor                  (:background 
gruvbox-neutral_red :foreground gruvbox-dark0))
-     (ediff-fine-diff-B                         (:background 
gruvbox-neutral_green :foreground gruvbox-dark0))
-     (ediff-fine-diff-C                         (:background 
gruvbox-neutral_blue :foreground gruvbox-dark0))
-     (ediff-current-diff-A                      (:background 
gruvbox-faded_yellow :foreground gruvbox-dark0))
-     (ediff-current-diff-Ancestor               (:background gruvbox-faded_red 
:foreground gruvbox-dark0))
-     (ediff-current-diff-B                      (:background 
gruvbox-faded_green :foreground gruvbox-dark0))
-     (ediff-current-diff-C                      (:background 
gruvbox-faded_blue :foreground gruvbox-dark0))
+
+     (ediff-fine-diff-A                         (:background 
gruvbox-ediff-fine-diff-A))
+     (ediff-fine-diff-Ancestor                  (:background 
gruvbox-ediff-fine-diff-Ancestor))
+     (ediff-fine-diff-B                         (:background 
gruvbox-ediff-fine-diff-B))
+     (ediff-fine-diff-C                         (:background 
gruvbox-ediff-fine-diff-C))
+     (ediff-current-diff-A                      (:background 
gruvbox-ediff-current-diff-A))
+     (ediff-current-diff-Ancestor               (:background 
gruvbox-ediff-current-diff-Ancestor))
+     (ediff-current-diff-B                      (:background 
gruvbox-ediff-current-diff-B))
+     (ediff-current-diff-C                      (:background 
gruvbox-ediff-current-diff-C))
 
      (js2-warning                               (:underline (:color 
gruvbox-bright_yellow :style 'wave)))
      (js2-error                                 (:underline (:color 
gruvbox-bright_red :style 'wave)))