themes: don't use nil to mean default

1 files changed, 25 insertions, 26 deletions

diff --git a/lib/themes/jao-themes.el b/lib/themes/jao-themes.el
index 37b091a..6753683 100644
--- a/lib/themes/jao-themes.el
+++ b/lib/themes/jao-themes.el
@@ -313,9 +313,9 @@
             (awesome-tray-module-rvm-face (p f00)))
           `((bbdb-company)
             (bbdb-field-name bf)
-            (bbdb-field-value nil)
+            (bbdb-field-value (~ default))
             (bbdb-name ul)
-            (bmk-mgr-bookmark-face nil)
+            (bmk-mgr-bookmark-face (~ default))
             (bmk-mgr-folder-face bf)
             (bmk-mgr-sel-bookmark-face link)
             (bmk-mgr-sel-folder-face bf)
@@ -430,7 +430,7 @@
             (diary (p f02))
             (dictionary-button-face (p link))
             (dictionary-reference-face (p f11))
-            (dictionary-word-definition-face nil)
+            (dictionary-word-definition-face (~ default))
             (dictionary-word-entry-face (p f10))
             (diff-added (p warning) ex)
             (diff-changed (p f02) nul)
@@ -573,7 +573,7 @@
             (font-lock-doc-face (p comment))
             (font-lock-function-name-face (p function))
             (font-lock-keyword-face (p keyword))
-            (font-lock-negation-char-face nil)
+            (font-lock-negation-char-face (~ default))
             (font-lock-preprocessor-face (p constant))
             (font-lock-regexp-grouping-backslash bf)
             (font-lock-regexp-grouping-construct bf)
@@ -605,7 +605,7 @@
             (git-gutter-fr:deleted (~ fringe) nbf)
             (git-gutter-fr:modified (~ fringe) nbf)
             (gnus-button (~ button))
-            (gnus-cite-attribution nil)
+            (gnus-cite-attribution (~ default))
             (gnus-cite-1 (p f10))
             (gnus-cite-2 (p f11))
             (gnus-cite-3 (p f12))
@@ -620,7 +620,7 @@
             (gnus-emphasis-bold bf)
             (gnus-emphasis-bold-italic bf)
             (gnus-emphasis-highlight-words (p hilite))
-            (gnus-emphasis-italic nil)
+            (gnus-emphasis-italic (~ default))
             (gnus-emphasis-strikethru st)
             (gnus-emphasis-underline ul)
             (gnus-emphasis-underline-bold bf ul)
@@ -659,7 +659,7 @@
             (gnus-header-name nbf (p f02))
             (gnus-header-newsgroups (p dimm))
             (gnus-header-subject (p f00) nbf)
-            (gnus-mouse-face nil)
+            (gnus-mouse-face (~ default))
             (gnus-server-agent nbf)
             (gnus-server-closed (p warning))
             (gnus-server-denied bf (p error))
@@ -818,7 +818,7 @@
             (markdown-code-face (p keyword))
             (markdown-inline-code-face (p function))
             (markdown-italic-face (~ italic))
-            (menu nil)
+            (menu (~ default))
             (message-cited-text-1 (p f10))
             (message-cited-text-2 (p f11))
             (message-cited-text-3 (p f12))
@@ -863,20 +863,20 @@
             (nrepl-input-face (p f01))
             (nrepl-output-face (p f02))
             (nrepl-prompt-face (p f00))
-            (nrepl-result-face nil)
+            (nrepl-result-face (~ default))
             (notmuch-crypto-decryption (~ success))
             (notmuch-crypto-part-header (p f11))
             (notmuch-crypto-signature-bad (p error) ul)
             (notmuch-crypto-signature-good (~ success))
             (notmuch-crypto-signature-unknown (p error) ul)
             (notmuch-crypto-signature-good-key (~ success))
-            (notmuch-hello-logo-background nil)
+            (notmuch-hello-logo-background (~ default))
             (notmuch-message-summary-face (p f00))
             (notmuch-search-count (p f00))
             (notmuch-search-date (p f01))
             (notmuch-search-flagged-face (p warn))
             (notmuch-search-matching-authors (p f02))
-            (notmuch-search-subject nil)
+            (notmuch-search-subject (~ default))
             (notmuch-tag-face (p f00) it)
             (notmuch-tag-unread (p warn))
             (notmuch-tree-match-author-face (p f01))
@@ -914,7 +914,7 @@
             (org-level-8 (~ outline-8))
             (org-link link)
             (org-noter-notes-exist-face it)
-            (org-property-value nil)
+            (org-property-value (~ default))
             (org-roam-link (~ org-link) it)
             (org-scheduled (p f01))
             (org-scheduled-previously (p f00) nbf)
@@ -995,7 +995,7 @@
             (slack-message-mention-keyword-face (p f01))
             (slack-message-mention-me-face (p error))
             (slack-message-output-header (p f00) it)
-            (slack-message-output-text nil)
+            (slack-message-output-text (~ default))
             (slack-new-message-marker-face (p warning))
             (slack-preview-face (p f11))
             (slack-search-result-message-header-face it)
@@ -1010,7 +1010,7 @@
             (slime-repl-input-face (p f00) bf)
             (slime-repl-inputed-output-face (p f02))
             (slime-repl-output-face (p string))
-            (sp-show-pair-enclosing nil)
+            (sp-show-pair-enclosing (~ default))
             (sp-show-pair-match-face (p hilite))
             (sp-show-pair-mismatch-face (p error))
             (spaceline-highlight-face-default (p f00))
@@ -1024,18 +1024,17 @@
             (speedbar-highlight-face (p hilite))
             (speedbar-selected-face ul)
             (speedbar-separator-face (p f00))
-            (scroll-bar nil)
-            (shadow nil)
+            (shadow (p dimm))
             (success (p success))
-            (sunshine-forecast-date-face nil)
+            (sunshine-forecast-date-face (~ default))
             (sunshine-forecast-day-divider-face (p dimm))
             (sunshine-forecast-headline-face (~ header-line)))
           `((telega-button (~ button))
             (telega-button-active (~ button))
             (telega-msg-heading (p f00))
             (telega-root-heading (p hilite))
-            (term nil)
-            (tool-bar nil)
+            (term (~ default))
+            (tool-bar (~ default))
             (tooltip :family ,jao-themes--face-family (c nil "lightyellow"))
             (trailing-whitespace (p error))
             (treemacs-root-face nul bf :scale 1.1)
@@ -1077,23 +1076,23 @@
             (w3m-session-selected bf nul (p f10))
             (w3m-strike-through st)
             (w3m-tab-background nul (c nil nil))
-            (w3m-tab-mouse nil)
+            (w3m-tab-mouse (~ default))
             (w3m-tab-selected (p tab-sel))
-            (w3m-tab-selected-background nil)
+            (w3m-tab-selected-background (~ default))
             (w3m-tab-selected-retrieving (p tab-sel) it)
             (w3m-tab-unselected (p tab-unsel))
             (w3m-tab-unselected-retrieving (p tab-unsel) it)
             (w3m-tab-unselected-unseen (p tab-unsel))
             (w3m-underline ul)
             (warning (p warning))
-            (wg-brace-face nil)
+            (wg-brace-face (~ default))
             (wg-command-face (p f00))
             (wg-current-workgroup-face (p f11) bf)
-            (wg-divider-face nil)
-            (wg-filename-face nil)
-            (wg-frame-face nil)
+            (wg-divider-face (~ default))
+            (wg-filename-face (~ default))
+            (wg-frame-face (~ default))
             (wg-message-face (p string))
-            (wg-mode-line-face nil)
+            (wg-mode-line-face (~ default))
             (wg-previous-workgroup-face (p f00))
             (wgrep-delete-face st)
             (wgrep-done-face (p f00))