fix: handle more nil => unspecified cases

Ref: #793

Author: hlissner

themes/doom-Iosvkem-theme.el

@@ -129,7 +129,7 @@ determine the exact padding."
 
   ;;;; Base theme face overrides
   (((font-lock-comment-face &override)
-    :background (if doom-Iosvkem-comment-bg (doom-lighten bg 0.05))
+    :background (if doom-Iosvkem-comment-bg (doom-lighten bg 0.05) 'unspecified)
     :slant 'italic)
    ((font-lock-function-name-face &override) :weight 'bold)
    ((font-lock-doc-face &override) :slant 'normal)

themes/doom-acario-light-theme.el

@@ -130,7 +130,7 @@ determine the exact padding."
   ;;;; Base theme face overrides
   (((font-lock-comment-face &override)
     :slant 'italic
-    :background (if doom-acario-light-comment-bg (doom-darken bg 0.05)))
+    :background (if doom-acario-light-comment-bg (doom-darken bg 0.05) 'unspecified))
    ((line-number &override) :foreground base4)
    ((line-number-current-line &override) :foreground orange)
    (mode-line

themes/doom-ayu-dark-theme.el

@@ -171,7 +171,7 @@ determine the exact padding."
    (diff-removed :foreground vcs-removed)
    (font-lock-comment-face
     :foreground comments
-    :background (if doom-ayu-dark-comment-bg (doom-lighten bg 0.05)))
+    :background (if doom-ayu-dark-comment-bg (doom-lighten bg 0.05) 'unspecified))
    (font-lock-doc-face
     :inherit 'font-lock-comment-face
     :foreground doc-comments)

themes/doom-ayu-light-theme.el

@@ -163,7 +163,7 @@ determine the exact padding."
   (((line-number &override) :foreground base5)
    ((line-number-current-line &override) :foreground fg)
    ((font-lock-comment-face &override)
-    :background (if doom-ayu-light-comment-bg (doom-lighten bg 0.05)))
+    :background (if doom-ayu-light-comment-bg (doom-lighten bg 0.05) 'unspecified))
    (mode-line
     :background modeline-bg :foreground modeline-fg
     :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg)))

themes/doom-badger-theme.el

@@ -137,7 +137,7 @@ determine the exact padding."
    ((line-number &override) :foreground base6)
    ((line-number-current-line &override)
     :foreground fg
-    :background (if doom-badger-comment-bg (doom-lighten bg 0.05)))
+    :background (if doom-badger-comment-bg (doom-lighten bg 0.05) 'unspecified))
    (mode-line
     :background modeline-bg :foreground modeline-fg
     :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg)))

themes/doom-city-lights-theme.el

@@ -123,7 +123,7 @@ determine the exact padding."
   (((line-number &override) :foreground base4)
    ((line-number-current-line &override) :foreground fg)
    ((font-lock-comment-face &override)
-    :background (if doom-city-lights-comment-bg (doom-lighten bg 0.05)))
+    :background (if doom-city-lights-comment-bg (doom-lighten bg 0.05) 'unspecified))
    (mode-line
     :background modeline-bg :foreground modeline-fg
     :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg)))

themes/doom-fairy-floss-theme.el

@@ -123,7 +123,7 @@ determine the exact padding."
 
   ;;;; Base theme face overrides
   (((font-lock-comment-face &override)
-    :background (if doom-fairy-floss-comment-bg (doom-lighten bg 0.05)))
+    :background (if doom-fairy-floss-comment-bg (doom-lighten bg 0.05) 'unspecified))
    ((font-lock-keyword-face &override ) :slant 'italic)
    ((hl-line &override) :background base2)
    ((line-number &override) :foreground base4)

themes/doom-gruvbox-light-theme.el

@@ -154,7 +154,7 @@ background contrast. All other values default to \"medium\"."
 
   ;;;; Base theme face overrides
   ((cursor :background base4)
-   ((font-lock-comment-face &override) :background (if doom-gruvbox-light-comment-bg base0))
+   ((font-lock-comment-face &override) :background (if doom-gruvbox-light-comment-bg base0 'unspecified))
    ((font-lock-doc-face &override) :slant 'italic)
    (isearch           :foreground "black" :background orange)
    (isearch-fail      :foreground fg :background red)
@@ -234,8 +234,8 @@ background contrast. All other values default to \"medium\"."
    (doom-dashboard-footer-icon :foreground (doom-darken yellow 0.4))
    (doom-dashboard-loaded      :foreground yellow)
    ;;;; diff-mode
-   (diff-changed                   :background nil :foreground base6)
-   (diff-removed                   :background nil :foreground red)
+   (diff-changed                   :foreground base6)
+   (diff-removed                   :foreground red)
    (diff-indicator-changed         :inherit 'diff-changed)
    (diff-indicator-added           :inherit 'diff-added)
    (diff-indicator-removed         :inherit 'diff-removed)
@@ -315,16 +315,16 @@ background contrast. All other values default to \"medium\"."
    (js2-warning                    :underline `(:style wave :color ,yellow))
    (js2-error                      :underline `(:style wave :color ,red))
    (js2-external-variable          :underline `(:style wave :color ,cyan))
-   (js2-jsdoc-tag                  :background nil :foreground grey  )
-   (js2-jsdoc-type                 :background nil :foreground light4)
-   (js2-jsdoc-value                :background nil :foreground light3)
-   (js2-function-param             :background nil :foreground cyan)
-   (js2-function-call              :background nil :foreground blue)
-   (js2-instance-member            :background nil :foreground orange)
-   (js2-private-member             :background nil :foreground yellow)
-   (js2-private-function-call      :background nil :foreground faded-aqua)
-   (js2-jsdoc-html-tag-name        :background nil :foreground light4)
-   (js2-jsdoc-html-tag-delimiter   :background nil :foreground light3)
+   (js2-jsdoc-tag                  :foreground grey)
+   (js2-jsdoc-type                 :foreground light4)
+   (js2-jsdoc-value                :foreground light3)
+   (js2-function-param             :foreground cyan)
+   (js2-function-call              :foreground blue)
+   (js2-instance-member            :foreground orange)
+   (js2-private-member             :foreground yellow)
+   (js2-private-function-call      :foreground faded-aqua)
+   (js2-jsdoc-html-tag-name        :foreground light4)
+   (js2-jsdoc-html-tag-delimiter   :foreground light3)
    ;;;; lsp-mode
    (lsp-face-highlight-textual     :background (doom-blend bg orange 0.9) :foreground base0 :distant-foreground base8)
    ;;;; lsp-ui
@@ -468,13 +468,13 @@ background contrast. All other values default to \"medium\"."
    (rainbox-delimiters-depth-8-face :foreground faded-orange)
    (rainbow-delimiters-depth-11-face :foreground delimiter-3)
    (rainbox-delimiters-depth-12-face :foreground faded-orange)
-   (rainbow-delimiters-unmatched-face: :foreground fg :background 'nil)
+   (rainbow-delimiters-unmatched-face: :foreground fg)
    ;;;; swiper
    (swiper-line-face    :background base3 :foreground base0)
-   (swiper-match-face-1 :inherit 'unspecified :background base1   :foreground base5)
-   (swiper-match-face-2 :inherit 'unspecified :background orange  :foreground base0 :weight 'bold)
+   (swiper-match-face-1 :inherit 'unspecified :background base1  :foreground base5)
+   (swiper-match-face-2 :inherit 'unspecified :background orange :foreground base0 :weight 'bold)
    (swiper-match-face-3 :inherit 'unspecified :background violet :foreground base1 :weight 'bold)
-   (swiper-match-face-4 :inherit 'unspecified :background green   :foreground base2 :weight 'bold)
+   (swiper-match-face-4 :inherit 'unspecified :background green  :foreground base2 :weight 'bold)
    (swiper-background-match-face-1 :inherit 'unspecified :background base2)
    (swiper-background-match-face-2 :inherit 'unspecified :background base3)
    (swiper-background-match-face-3 :inherit 'unspecified :background base4)
@@ -505,7 +505,7 @@ background contrast. All other values default to \"medium\"."
    (whitespace-trailing :foreground red :background base1)
    (whitespace-line :foreground red :background base1)
    (whitespace-indentation :foreground base4 :background bg)
-   (whitespace-empty :foreground 'nil :background 'nil))
+   (whitespace-empty))
 
   ;;;; Base theme variable overrides-
   ())

themes/doom-henna-theme.el

@@ -128,7 +128,7 @@ determine the exact padding."
 
   ;;;; Base theme face overrides
   (((font-lock-comment-face &override)
-    :background (if doom-henna-comment-bg (doom-lighten bg 0.05)))
+    :background (if doom-henna-comment-bg (doom-lighten bg 0.05) 'unspecified))
    ((line-number &override) :foreground base7)
    ((line-number-current-line &override) :foreground fg)
    (mode-line

themes/doom-horizon-theme.el

@@ -121,7 +121,7 @@
   ;;;; Base theme face overrides
   (((font-lock-comment-face &override)
     :slant 'italic
-    :background (if doom-horizon-comment-bg (doom-lighten bg 0.03)))
+    :background (if doom-horizon-comment-bg (doom-lighten bg 0.03) 'unspecified))
    (fringe :background bg)
    (link :foreground yellow :inherit 'underline)
    ((line-number &override) :foreground hor-highlight-selected)

themes/doom-nord-light-theme.el

@@ -132,7 +132,7 @@ determine the exact padding."
 
   ;;;; Base theme face overrides
   (((font-lock-comment-face &override)
-    :background (if doom-nord-light-comment-bg (doom-lighten bg 0.05)))
+    :background (if doom-nord-light-comment-bg (doom-lighten bg 0.05) 'unspecified))
    ((line-number &override) :foreground (doom-lighten 'base5 0.2))
    ((line-number-current-line &override) :foreground base7)
    (internal-border :foreground (doom-blend blue bg 0.2) :background (doom-blend blue bg 0.2))
@@ -158,7 +158,7 @@ determine the exact padding."
    ;;;; elscreen
    (elscreen-tab-other-screen-face :background "#353a42" :foreground "#1e2022")
    ;;;; ivy
-   (ivy-minibuffer-match-face-1 :background nil :foreground (doom-blend fg bg 0.5) :weight 'light)
+   (ivy-minibuffer-match-face-1 :foreground (doom-blend fg bg 0.5) :weight 'light)
    (ivy-virtual :foreground (doom-blend blue bg 0.8))
    ;;;; ivy-posframe
    (ivy-posframe :background (doom-blend blue bg 0.2))

themes/doom-oceanic-next-theme.el

@@ -127,7 +127,7 @@ determine the exact padding."
    ((line-number &override) :foreground base4)
    ((line-number-current-line &override) :foreground fg)
    ((font-lock-comment-face &override)
-    :background (if doom-oceanic-next-comment-bg (doom-lighten bg 0.05)))
+    :background (if doom-oceanic-next-comment-bg (doom-lighten bg 0.05) 'unspecified))
 
    (mode-line
     :background modeline-bg :foreground modeline-fg

themes/doom-old-hope-theme.el

@@ -127,7 +127,7 @@ determine the exact padding."
    ((line-number &override) :foreground base4)
    ((line-number-current-line &override) :foreground fg)
    ((font-lock-comment-face &override)
-    :background (if doom-old-hope-comment-bg (doom-lighten bg 0.05)))
+    :background (if doom-old-hope-comment-bg (doom-lighten bg 0.05) 'unspecified))
    (mode-line
     :background modeline-bg :foreground modeline-fg
     :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg)))

themes/doom-opera-light-theme.el

@@ -128,7 +128,7 @@ determine the exact padding."
 
   ;;;; Base theme face overrides
   (((font-lock-comment-face &override)
-    :background (if doom-opera-light-comment-bg (doom-lighten bg 0.05)))
+    :background (if doom-opera-light-comment-bg (doom-lighten bg 0.05) 'unspecified))
    (lazy-highlight :background (doom-blend bg highlight 0.7) :weight 'bold)
    ((line-number &override) :foreground fg-alt)
    ((line-number-current-line &override) :foreground fg)

themes/doom-opera-theme.el

@@ -130,7 +130,7 @@ determine the exact padding."
   (((line-number &override) :foreground fg-alt)
    ((line-number-current-line &override) :foreground fg)
    ((font-lock-comment-face &override)
-    :background (if doom-opera-comment-bg (doom-lighten bg 0.05)))
+    :background (if doom-opera-comment-bg (doom-lighten bg 0.05) 'unspecified))
    (mode-line
     :background modeline-bg :foreground modeline-fg
     :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg)))

themes/doom-outrun-electric-theme.el

@@ -123,7 +123,7 @@ determine the exact padding."
 
   ;;;; Base theme face overrides
   (((font-lock-comment-face &override)
-    :background (if doom-outrun-electric-comment-bg (doom-lighten bg 0.05)))
+    :background (if doom-outrun-electric-comment-bg (doom-lighten bg 0.05) 'unspecified))
    ((font-lock-keyword-face &override) :weight 'bold)
    ((font-lock-constant-face &override) :weight 'bold)
    ((font-lock-function-name-face &override) :foreground functions)

themes/doom-sourcerer-theme.el

@@ -122,7 +122,7 @@ Can be an integer to determine the exact padding."
   ;;;; Base theme face overrides
   ((cursor :background blue)
    ((font-lock-comment-face &override)
-    :background (if doom-sourcerer-comment-bg (doom-darken bg-alt 0.095)))
+    :background (if doom-sourcerer-comment-bg (doom-darken bg-alt 0.095) 'unspecified))
    ((line-number &override) :foreground base4)
    ((line-number-current-line &override) :foreground blue :bold bold)
    (mode-line

themes/doom-spacegrey-theme.el

@@ -124,7 +124,7 @@ determine the exact padding."
 
   ;;;; Base theme face overrides
   (((font-lock-comment-face &override)
-    :background (if doom-spacegrey-comment-bg (doom-lighten bg 0.05)))
+    :background (if doom-spacegrey-comment-bg (doom-lighten bg 0.05) 'unspecified))
    ((line-number &override) :foreground base4)
    ((line-number-current-line &override) :foreground fg)
    (mode-line

themes/doom-zenburn-theme.el

@@ -147,7 +147,7 @@ Can be an integer to determine the exact padding."
    (font-lock-builtin-face :foreground fg :weight 'bold)
    (font-lock-comment-delimiter-face :foreground green-2)
    ((font-lock-comment-face &override)
-    :background (if doom-zenburn-comment-bg (doom-lighten bg 0.05)))
+    :background (if doom-zenburn-comment-bg (doom-lighten bg 0.05) 'unspecified))
    (font-lock-constant-face :foreground green+4)
    (font-lock-doc-face :foreground green+2)
    (font-lock-type-face :foreground blue-1)