branch: elpa/zenburn-theme
commit 792b703649592f039882b83412a19ccd6431dfd5
Author: Bozhidar Batsov <[email protected]>
Commit: Bozhidar Batsov <[email protected]>

    Fix legacy *-face entries that were setting specs on defcustoms
    
    Symbols like compilation-warning-face / grep-error-face / hl-line-face
    are defcustoms holding the name of a face, not faces themselves.
    Theme entries on them have been silent no-ops for years.
    
    Rename the three whose styling intent was unique (and lost) to the real
    underlying face: compilation-column-number, compilation-error,
    compilation-warning. Drop ten more dead entries whose underlying real
    face is either already themed correctly elsewhere in the file or is a
    generic helper face (shadow, underline) the theme shouldn't override.
---
 CHANGELOG.md     |  5 +++++
 zenburn-theme.el | 17 +++--------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ecf3c1376..2364d11aa5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,11 @@
 * Add `corfu-popupinfo` face.
 * Add `flymake-end-of-line-diagnostics-face` and 
`flymake-{error,warning,note}-echo` faces.
 
+### Bug fixes
+
+* Fix three compilation faces that were theming the wrong symbol: 
`compilation-column-face`, `compilation-error-face`, and 
`compilation-warning-face` are defcustoms holding face names, not faces 
themselves, so the theme entries did nothing. Renamed to the real faces 
`compilation-column-number`, `compilation-error`, and `compilation-warning`.
+* Drop ten more dead `*-face` theme entries that were setting specs on 
defcustoms instead of faces (no behavioral effect): `compilation-face`, 
`compilation-info-face`, `compilation-line-face`, `compilation-message-face`, 
`compilation-enter-directory-face`, `compilation-leave-directory-face`, 
`grep-context-face`, `grep-error-face`, `grep-hit-face`, `grep-match-face`, and 
`hl-line-face`. Their real targets are either already themed under the correct 
name or generic faces (`shadow`, `underl [...]
+
 ### Changes
 
 * Promote `zenburn-use-variable-pitch`, `zenburn-scale-org-headlines`, and 
`zenburn-scale-outline-headlines` from plain `defvar`s to boolean `defcustom`s 
so they show up in `M-x customize-group RET zenburn-theme` and accept safe 
file-local values.
diff --git a/zenburn-theme.el b/zenburn-theme.el
index 31069dd24b..fea799386a 100644
--- a/zenburn-theme.el
+++ b/zenburn-theme.el
@@ -268,17 +268,11 @@ the just-introduced bindings."
    `(ansi-color-white ((t (:foreground ,zenburn-fg
                                        :background ,zenburn-fg-1))))
 ;;;;; compilation
-   `(compilation-column-face ((t (:foreground ,zenburn-yellow))))
-   `(compilation-enter-directory-face ((t (:foreground ,zenburn-green))))
-   `(compilation-error-face ((t (:foreground ,zenburn-red-1 :weight bold 
:underline t))))
-   `(compilation-face ((t (:foreground ,zenburn-fg))))
-   `(compilation-info-face ((t (:foreground ,zenburn-blue))))
+   `(compilation-column-number ((t (:foreground ,zenburn-yellow))))
+   `(compilation-error ((t (:foreground ,zenburn-red-1 :weight bold :underline 
t))))
    `(compilation-info ((t (:foreground ,zenburn-green+4 :underline t))))
-   `(compilation-leave-directory-face ((t (:foreground ,zenburn-green))))
-   `(compilation-line-face ((t (:foreground ,zenburn-yellow))))
    `(compilation-line-number ((t (:foreground ,zenburn-yellow))))
-   `(compilation-message-face ((t (:foreground ,zenburn-blue))))
-   `(compilation-warning-face ((t (:inherit warning :underline t))))
+   `(compilation-warning ((t (:inherit warning :underline t))))
    `(compilation-mode-line-exit ((t (:foreground ,zenburn-green+2 :weight 
bold))))
    `(compilation-mode-line-fail ((t (:inherit error))))
    `(compilation-mode-line-run ((t (:foreground ,zenburn-yellow :weight 
bold))))
@@ -301,10 +295,6 @@ the just-introduced bindings."
    '(eww-invalid-certificate ((t (:inherit error))))
    '(eww-valid-certificate   ((t (:inherit success))))
 ;;;;; grep
-   `(grep-context-face ((t (:foreground ,zenburn-fg))))
-   `(grep-error-face ((t (:foreground ,zenburn-red-1 :weight bold :underline 
t))))
-   `(grep-hit-face ((t (:foreground ,zenburn-blue))))
-   `(grep-match-face ((t (:foreground ,zenburn-orange :weight bold))))
    `(match ((t (:background ,zenburn-bg-1 :foreground ,zenburn-orange :weight 
bold))))
 ;;;;; hi-lock
    `(hi-blue    ((t (:background ,zenburn-cyan    :foreground ,zenburn-bg-1))))
@@ -1140,7 +1130,6 @@ the just-introduced bindings."
 ;;;;; highlight-thing
    `(highlight-thing ((t (:background ,zenburn-bg+2))))
 ;;;;; hl-line-mode
-   `(hl-line-face ((t (:background ,zenburn-bg-05))))
    `(hl-line ((t (:background ,zenburn-bg-05 :extend t))))
 ;;;;; hl-sexp
    `(hl-sexp-face ((t (:background ,zenburn-bg+1))))

Reply via email to