From 1f3995f65a065a28e108653128b31a2fb7eeb01c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mattias=20Engdeg=C3=A5rd?= Date: Sun, 30 Jul 2023 18:42:13 +0200 Subject: [PATCH] Avoid face attribute warnings in themes * etc/themes/deeper-blue-theme.el (class): * etc/themes/leuven-dark-theme.el (class): * etc/themes/leuven-theme.el (class): * etc/themes/manoj-dark-theme.el (manoj-dark): * etc/themes/whiteboard-theme.el (class): Use `unspecified` instead of `nil` as attribute for :background and :foreground to silence HANDLE_INVALID_NIL_VALUE warning. --- etc/themes/deeper-blue-theme.el | 8 ++++---- etc/themes/leuven-dark-theme.el | 8 ++++---- etc/themes/leuven-theme.el | 8 ++++---- etc/themes/manoj-dark-theme.el | 4 ++-- etc/themes/whiteboard-theme.el | 8 ++++---- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/etc/themes/deeper-blue-theme.el b/etc/themes/deeper-blue-theme.el index 40d5f18a011..20da432c75a 100644 --- a/etc/themes/deeper-blue-theme.el +++ b/etc/themes/deeper-blue-theme.el @@ -64,8 +64,8 @@ `(ediff-fine-diff-B ((,class (:background "cyan4" :foreground "white")))) `(ediff-odd-diff-A ((,class (:background "Grey50" :foreground "White")))) `(error ((,class (:foreground "red")))) - `(flymake-errline ((,class (:background nil :underline "red")))) - `(flymake-warnline ((,class (:background nil :underline "magenta3")))) + `(flymake-errline ((,class (:background unspecified :underline "red")))) + `(flymake-warnline ((,class (:background unspecified :underline "magenta3")))) `(font-lock-builtin-face ((,class (:foreground "LightCoral")))) `(font-lock-comment-delimiter-face ((,class (:foreground "gray50")))) `(font-lock-comment-face ((,class (:foreground "gray50")))) @@ -84,7 +84,7 @@ `(highlight ((,class (:background "DodgerBlue4")))) `(ido-first-match ((,class (:weight normal :foreground "orange")))) `(ido-only-match ((,class (:foreground "green")))) - `(ido-subdir ((,class (:foreground nil :inherit font-lock-keyword-face)))) + `(ido-subdir ((,class (:foreground unspecified :inherit font-lock-keyword-face)))) `(image-dired-thumb-flagged ((,class (:background "Red1")))) `(image-dired-thumb-mark ((,class (:background "dodgerblue3")))) `(info-header-node ((,class (:foreground "DeepSkyBlue1")))) @@ -98,7 +98,7 @@ `(match ((,class (:background "DeepPink4")))) `(minibuffer-prompt ((,class (:foreground "CadetBlue1")))) `(mode-line ((,class (:background "gray75" :foreground "black" :box (:line-width 1 :style released-button))))) - `(mode-line-buffer-id ((,class (:weight bold :background nil :foreground "blue4")))) + `(mode-line-buffer-id ((,class (:weight bold :background unspecified :foreground "blue4")))) `(mode-line-inactive ((,class (:background "gray40" :foreground "black" :box (:line-width 1 :color "gray40" :style nil))))) `(outline-1 ((,class (:foreground "SkyBlue1")))) `(outline-2 ((,class (:foreground "CadetBlue1")))) diff --git a/etc/themes/leuven-dark-theme.el b/etc/themes/leuven-dark-theme.el index fda00f1282f..bfe5256ab97 100644 --- a/etc/themes/leuven-dark-theme.el +++ b/etc/themes/leuven-dark-theme.el @@ -621,11 +621,11 @@ more..." `(helm-source-header ((,class (:weight bold :box (:line-width 1 :color "#3d3842") :background "#433e48" :foreground "#ffffff")))) `(helm-swoop-target-line-block-face ((,class (:background "#3833ff" :foreground "#e0dde3")))) `(helm-swoop-target-line-face ((,class (:background "#38330b")))) - `(helm-swoop-target-word-face ((,class (:weight bold :foreground nil :background "#0742d2")))) + `(helm-swoop-target-word-face ((,class (:weight bold :foreground unspecified :background "#0742d2")))) `(helm-visible-mark ((,class ,marked-line))) `(helm-w3m-bookmarks-face ((,class (:underline t :foreground "#ff010b")))) - `(highlight-changes ((,class (:foreground nil)))) ;; blue "#d4f754" - `(highlight-changes-delete ((,class (:strike-through nil :foreground nil)))) ;; red "#4ff7d7" + `(highlight-changes ((,class (:foreground unspecified)))) ;; blue "#d4f754" + `(highlight-changes-delete ((,class (:strike-through nil :foreground unspecified)))) ;; red "#4ff7d7" `(highlight-symbol-face ((,class (:background "#252080")))) `(hl-line ((,class ,highlight-yellow))) ; Highlight current line. `(hl-tags-face ((,class ,highlight-current-tag))) ; ~ Pair highlighting (matching tags). @@ -643,7 +643,7 @@ more..." `(info-file ((,class (:family "Sans Serif" :height 1.8 :weight bold :box (:line-width 1 :color "#ffff3d") :foreground "#9f6a1c" :background "#563c2a")))) `(info-header-node ((,class (:underline t :foreground "#065aff")))) ; nodes in header `(info-header-xref ((,class (:underline t :foreground "#e46f0b")))) ; cross references in header - `(info-index-match ((,class (:weight bold :foreground nil :background "#0742d2")))) ; when using `i' + `(info-index-match ((,class (:weight bold :foreground unspecified :background "#0742d2")))) ; when using `i' `(info-menu-header ((,class ,ol2))) ; menu titles (headers) -- major topics `(info-menu-star ((,class (:foreground "#ffffff")))) ; every 3rd menu item `(info-node ((,class (:underline t :foreground "#ffff0b")))) ; node names diff --git a/etc/themes/leuven-theme.el b/etc/themes/leuven-theme.el index 7747d1e7315..f7d454381d7 100644 --- a/etc/themes/leuven-theme.el +++ b/etc/themes/leuven-theme.el @@ -618,11 +618,11 @@ more..." `(helm-source-header ((,class (:weight bold :box (:line-width 1 :color "#C7C7C7") :background "#DEDEDE" :foreground "black")))) `(helm-swoop-target-line-block-face ((,class (:background "#CCCC00" :foreground "#222222")))) `(helm-swoop-target-line-face ((,class (:background "#CCCCFF")))) - `(helm-swoop-target-word-face ((,class (:weight bold :foreground nil :background "#FDBD33")))) + `(helm-swoop-target-word-face ((,class (:weight bold :foreground unspecified :background "#FDBD33")))) `(helm-visible-mark ((,class ,marked-line))) `(helm-w3m-bookmarks-face ((,class (:underline t :foreground "cyan1")))) - `(highlight-changes ((,class (:foreground nil)))) ;; blue "#2E08B5" - `(highlight-changes-delete ((,class (:strike-through nil :foreground nil)))) ;; red "#B5082E" + `(highlight-changes ((,class (:foreground unspecified)))) ;; blue "#2E08B5" + `(highlight-changes-delete ((,class (:strike-through nil :foreground unspecified)))) ;; red "#B5082E" `(highlight-symbol-face ((,class (:background "#FFFFA0")))) `(hl-line ((,class ,highlight-yellow))) ; Highlight current line. `(hl-tags-face ((,class ,highlight-current-tag))) ; ~ Pair highlighting (matching tags). @@ -642,7 +642,7 @@ more..." `(info-file ((,class (:family "Sans Serif" :height 1.8 :weight bold :box (:line-width 1 :color "#0000CC") :foreground "cornflower blue" :background "LightSteelBlue1")))) `(info-header-node ((,class (:underline t :foreground "orange")))) ; nodes in header `(info-header-xref ((,class (:underline t :foreground "dodger blue")))) ; cross references in header - `(info-index-match ((,class (:weight bold :foreground nil :background "#FDBD33")))) ; when using `i' + `(info-index-match ((,class (:weight bold :foreground unspecified :background "#FDBD33")))) ; when using `i' `(info-menu-header ((,class ,ol2))) ; menu titles (headers) -- major topics `(info-menu-star ((,class (:foreground "black")))) ; every 3rd menu item `(info-node ((,class (:underline t :foreground "blue")))) ; node names diff --git a/etc/themes/manoj-dark-theme.el b/etc/themes/manoj-dark-theme.el index 1c3e23908d1..26627a29c70 100644 --- a/etc/themes/manoj-dark-theme.el +++ b/etc/themes/manoj-dark-theme.el @@ -526,8 +526,8 @@ jarring angry fruit salad look to reduce eye fatigue." '(widget-mouse-face ((t (:background "darkseagreen2" :foreground "blue")))) '(highlight-beyond-fill-column-face ((t (:underline t)))) - '(highlight-changes ((t (:foreground nil :background "#382f2f")))) - '(highlight-changes-delete ((t (:foreground nil :background "#916868")))) + '(highlight-changes ((t (:foreground unspecified :background "#382f2f")))) + '(highlight-changes-delete ((t (:foreground unspecified :background "#916868")))) '(holiday ((t (:background "chocolate4")))) '(holiday-face ((t (:background "chocolate4")))) diff --git a/etc/themes/whiteboard-theme.el b/etc/themes/whiteboard-theme.el index adbd69f1c6f..b52996c24c0 100644 --- a/etc/themes/whiteboard-theme.el +++ b/etc/themes/whiteboard-theme.el @@ -44,8 +44,8 @@ `(cursor ((,class (:background "Green4")))) `(default ((,class (:background "whitesmoke" :foreground "black")))) `(dired-marked ((,class (:background "dodgerblue3" :foreground "white")))) - `(flymake-errline ((,class (:background nil :underline "red")))) - `(flymake-warnline ((,class (:background nil :underline "magenta3")))) + `(flymake-errline ((,class (:background unspecified :underline "red")))) + `(flymake-warnline ((,class (:background unspecified :underline "magenta3")))) `(font-lock-builtin-face ((,class (:foreground "DarkOrange3")))) `(font-lock-comment-delimiter-face ((,class (:foreground "gray50")))) `(font-lock-comment-face ((,class (:foreground "gray50")))) @@ -65,7 +65,7 @@ `(highlight ((,class (:background "SkyBlue1")))) `(ido-first-match ((,class (:weight normal :foreground "DarkOrange3")))) `(ido-only-match ((,class (:foreground "SeaGreen4")))) - `(ido-subdir ((,class (:foreground nil :inherit font-lock-keyword-face)))) + `(ido-subdir ((,class (:foreground unspecified :inherit font-lock-keyword-face)))) `(image-dired-thumb-flagged ((,class :background "Red1"))) `(image-dired-thumb-mark ((,class :background "dodgerblue3"))) `(info-header-node ((,class (:foreground "DeepSkyBlue1")))) @@ -79,7 +79,7 @@ `(match ((,class (:background "LightPink1")))) `(minibuffer-prompt ((,class (:foreground "DodgerBlue4")))) `(mode-line ((,class (:background "gray75" :foreground "black" :box (:line-width 1 :style released-button))))) - `(mode-line-buffer-id ((,class (:weight bold :background nil :foreground "blue4")))) + `(mode-line-buffer-id ((,class (:weight bold :background unspecified :foreground "blue4")))) `(mode-line-inactive ((,class (:background "gray40" :foreground "black" :box (:line-width 1 :color "gray40" :style nil))))) `(outline-1 ((,class (:foreground "Blue3")))) `(outline-2 ((,class (:foreground "DodgerBlue")))) -- 2.39.2