branch: elpa/zenburn-theme
commit 734422acabee24768ca22feb405f966cc6191a65
Author: Bozhidar Batsov <[email protected]>
Commit: Bozhidar Batsov <[email protected]>
Drop legacy display-class branching
The ((class color) (min-colors 89)) dance and the corresponding low-color
terminal fallbacks haven't earned their keep in a decade. Collapse the
seven multi-clause specs (mode-line, region, diff-header, diff-file-header,
hl-line, hl-line-face, hl-sexp-face) to a single t clause with the colored
spec, convert the remaining single-clause (,class ...) entries to (t ...),
and remove the now-dead `class' binding from zenburn-with-color-variables.
---
CHANGELOG.md | 1 +
zenburn-theme.el | 86 +++++++++++++++++++++++++-------------------------------
2 files changed, 39 insertions(+), 48 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb43ca254c..fa6b0b126c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
### Changes
+* Drop the legacy `((class color) (min-colors 89))` display-class dance and
the obsolete low-color terminal fallbacks (`:inverse-video`, swapped fg/bg,
monochrome `:weight bold`) for `mode-line`, `region`, `diff-header`,
`diff-file-header`, `hl-line`, `hl-line-face`, and `hl-sexp-face`. Modern
terminals all qualify as full-color, so the branching no longer earns its keep.
* Route `adoc-comment-face`, `ledger-font-comment-face`, and `js2-jsdoc-type`
through `:inherit` so they track customizations to `font-lock-comment-face` /
`font-lock-doc-face`.
* Expand `adoc-mode` support: cover all 37 faces, give title levels distinct
per-level colors with optional scaling via `zenburn-scale-outline-headlines`,
differentiate `adoc-meta-face` from `adoc-meta-hide-face`, and fix
`adoc-emphasis-face` to render italic instead of bold.
diff --git a/zenburn-theme.el b/zenburn-theme.el
index 97c69d4d11..650f7b726b 100644
--- a/zenburn-theme.el
+++ b/zenburn-theme.el
@@ -208,12 +208,9 @@ Bindings are introduced in order: positional palette first
(from
`zenburn-default-semantic-colors-alist' overlaid with
`zenburn-override-semantic-colors-alist'). Semantic values may
reference positional palette names as symbols, which resolve against
-the just-introduced bindings.
-
-Also bind `class' to ((class color) (min-colors 89))."
+the just-introduced bindings."
(declare (indent 0))
- `(let* ((class '((class color) (min-colors 89)))
- ,@(mapcar (lambda (cons)
+ `(let* (,@(mapcar (lambda (cons)
(list (intern (car cons)) (cdr cons)))
(append zenburn-default-colors-alist
zenburn-override-colors-alist))
@@ -294,7 +291,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(custom-group-tag ((t (:foreground ,zenburn-blue :weight bold :height
1.2))))
`(custom-state ((t (:foreground ,zenburn-green+4))))
;;;;; display-fill-column-indicator
- `(fill-column-indicator ((,class :foreground ,zenburn-bg-05 :weight
semilight)))
+ `(fill-column-indicator ((t :foreground ,zenburn-bg-05 :weight semilight)))
;;;;; eldoc
`(eldoc-highlight-function-argument ((t (:foreground ,zenburn-yellow
:weight bold))))
;;;;; eww
@@ -326,18 +323,16 @@ Also bind `class' to ((class color) (min-colors 89))."
`(menu ((t (:foreground ,zenburn-fg :background ,zenburn-bg))))
`(minibuffer-prompt ((t (:foreground ,zenburn-yellow))))
`(mode-line
- ((,class (:foreground ,zenburn-green+1
- :background ,zenburn-bg-1
- :box (:line-width -1 :style released-button)))
- (t :inverse-video t)))
- `(mode-line-active ((,class (:inherit mode-line))))
+ ((t (:foreground ,zenburn-green+1
+ :background ,zenburn-bg-1
+ :box (:line-width -1 :style released-button)))))
+ `(mode-line-active ((t (:inherit mode-line))))
`(mode-line-buffer-id ((t (:foreground ,zenburn-yellow :weight bold))))
`(mode-line-inactive
((t (:foreground ,zenburn-green-2
:background ,zenburn-bg-05
:box (:line-width -1 :style released-button)))))
- `(region ((,class (:background ,zenburn-bg-1 :extend t))
- (t :inverse-video t)))
+ `(region ((t (:background ,zenburn-bg-1 :extend t))))
`(secondary-selection ((t (:background ,zenburn-bg+2))))
`(trailing-whitespace ((t (:background ,zenburn-red))))
`(vertical-border ((t (:foreground ,zenburn-fg))))
@@ -669,15 +664,13 @@ Also bind `class' to ((class color) (min-colors 89))."
`(diff-refine-added ((t (:background ,zenburn-diff-refine-added-bg
:foreground ,zenburn-diff-refine-added-fg))))
`(diff-refine-changed ((t (:background ,zenburn-diff-refine-changed-bg
:foreground ,zenburn-diff-refine-changed-fg))))
`(diff-refine-removed ((t (:background ,zenburn-diff-refine-removed-bg
:foreground ,zenburn-diff-refine-removed-fg))))
- `(diff-header ((,class (:background ,zenburn-bg+2))
- (t (:background ,zenburn-fg :foreground ,zenburn-bg))))
+ `(diff-header ((t (:background ,zenburn-bg+2))))
`(diff-file-header
- ((,class (:background ,zenburn-bg+2 :foreground ,zenburn-fg :weight bold))
- (t (:background ,zenburn-fg :foreground ,zenburn-bg :weight bold))))
+ ((t (:background ,zenburn-bg+2 :foreground ,zenburn-fg :weight bold))))
;;;;; diff-hl
- `(diff-hl-change ((,class (:foreground ,zenburn-blue :background
,zenburn-blue-2))))
- `(diff-hl-delete ((,class (:foreground ,zenburn-red+1 :background
,zenburn-red-1))))
- `(diff-hl-insert ((,class (:foreground ,zenburn-green+1 :background
,zenburn-green-2))))
+ `(diff-hl-change ((t (:foreground ,zenburn-blue :background
,zenburn-blue-2))))
+ `(diff-hl-delete ((t (:foreground ,zenburn-red+1 :background
,zenburn-red-1))))
+ `(diff-hl-insert ((t (:foreground ,zenburn-green+1 :background
,zenburn-green-2))))
;;;;; dim-autoload
`(dim-autoload-cookie-line ((t :foreground ,zenburn-bg+1)))
;;;;; dired+
@@ -987,11 +980,11 @@ Also bind `class' to ((class color) (min-colors 89))."
'(git-annex-dired-annexed-available ((t (:inherit success :weight normal))))
'(git-annex-dired-annexed-unavailable ((t (:inherit error :weight normal))))
;;;;; git-commit
- `(git-commit-comment-action ((,class (:foreground ,zenburn-green+1 :weight
bold))))
- `(git-commit-comment-branch ((,class (:foreground ,zenburn-blue+1 :weight
bold)))) ; obsolete
- `(git-commit-comment-branch-local ((,class (:foreground ,zenburn-blue+1
:weight bold))))
- `(git-commit-comment-branch-remote ((,class (:foreground ,zenburn-green
:weight bold))))
- `(git-commit-comment-heading ((,class (:foreground ,zenburn-yellow :weight
bold))))
+ `(git-commit-comment-action ((t (:foreground ,zenburn-green+1 :weight
bold))))
+ `(git-commit-comment-branch ((t (:foreground ,zenburn-blue+1 :weight
bold)))) ; obsolete
+ `(git-commit-comment-branch-local ((t (:foreground ,zenburn-blue+1
:weight bold))))
+ `(git-commit-comment-branch-remote ((t (:foreground ,zenburn-green :weight
bold))))
+ `(git-commit-comment-heading ((t (:foreground ,zenburn-yellow :weight
bold))))
;;;;; git-gutter
`(git-gutter:added ((t (:foreground ,zenburn-green :weight bold
:inverse-video t))))
`(git-gutter:deleted ((t (:foreground ,zenburn-red :weight bold
:inverse-video t))))
@@ -1144,13 +1137,10 @@ Also bind `class' to ((class color) (min-colors 89))."
;;;;; highlight-thing
`(highlight-thing ((t (:background ,zenburn-bg+2))))
;;;;; hl-line-mode
- `(hl-line-face ((,class (:background ,zenburn-bg-05))
- (t :weight bold)))
- `(hl-line ((,class (:background ,zenburn-bg-05 :extend t)) ; old emacsen
- (t :weight bold)))
+ `(hl-line-face ((t (:background ,zenburn-bg-05))))
+ `(hl-line ((t (:background ,zenburn-bg-05 :extend t))))
;;;;; hl-sexp
- `(hl-sexp-face ((,class (:background ,zenburn-bg+1))
- (t :weight bold)))
+ `(hl-sexp-face ((t (:background ,zenburn-bg+1))))
;;;;; hl-todo
`(hl-todo ((t (:foreground ,zenburn-magenta :weight bold))))
;;;;; hydra
@@ -1829,23 +1819,23 @@ Also bind `class' to ((class color) (min-colors 89))."
`(show-paren-match ((t (:foreground ,zenburn-fg :background ,zenburn-bg+3
:weight bold))))
;;;;; smart-mode-line
;; use (setq sml/theme nil) to enable Zenburn for sml
- `(sml/global ((,class (:foreground ,zenburn-fg :weight bold))))
- `(sml/modes ((,class (:foreground ,zenburn-yellow :weight bold))))
- `(sml/minor-modes ((,class (:foreground ,zenburn-fg-1 :weight bold))))
- `(sml/filename ((,class (:foreground ,zenburn-yellow :weight bold))))
- `(sml/line-number ((,class (:foreground ,zenburn-blue :weight bold))))
- `(sml/col-number ((,class (:foreground ,zenburn-blue+1 :weight bold))))
- `(sml/position-percentage ((,class (:foreground ,zenburn-blue-1 :weight
bold))))
- `(sml/prefix ((,class (:foreground ,zenburn-orange))))
- `(sml/git ((,class (:foreground ,zenburn-green+3))))
- `(sml/process ((,class (:weight bold))))
- `(sml/sudo ((,class (:foreground ,zenburn-orange :weight bold))))
- `(sml/read-only ((,class (:foreground ,zenburn-red-2))))
- `(sml/outside-modified ((,class (:foreground ,zenburn-orange))))
- `(sml/modified ((,class (:foreground ,zenburn-red))))
- `(sml/vc-edited ((,class (:foreground ,zenburn-green+2))))
- `(sml/charging ((,class (:foreground ,zenburn-green+4))))
- `(sml/discharging ((,class (:foreground ,zenburn-red+1))))
+ `(sml/global ((t (:foreground ,zenburn-fg :weight bold))))
+ `(sml/modes ((t (:foreground ,zenburn-yellow :weight bold))))
+ `(sml/minor-modes ((t (:foreground ,zenburn-fg-1 :weight bold))))
+ `(sml/filename ((t (:foreground ,zenburn-yellow :weight bold))))
+ `(sml/line-number ((t (:foreground ,zenburn-blue :weight bold))))
+ `(sml/col-number ((t (:foreground ,zenburn-blue+1 :weight bold))))
+ `(sml/position-percentage ((t (:foreground ,zenburn-blue-1 :weight bold))))
+ `(sml/prefix ((t (:foreground ,zenburn-orange))))
+ `(sml/git ((t (:foreground ,zenburn-green+3))))
+ `(sml/process ((t (:weight bold))))
+ `(sml/sudo ((t (:foreground ,zenburn-orange :weight bold))))
+ `(sml/read-only ((t (:foreground ,zenburn-red-2))))
+ `(sml/outside-modified ((t (:foreground ,zenburn-orange))))
+ `(sml/modified ((t (:foreground ,zenburn-red))))
+ `(sml/vc-edited ((t (:foreground ,zenburn-green+2))))
+ `(sml/charging ((t (:foreground ,zenburn-green+4))))
+ `(sml/discharging ((t (:foreground ,zenburn-red+1))))
;;;;; smartparens
`(sp-show-pair-mismatch-face ((t (:foreground ,zenburn-red+1 :background
,zenburn-bg+3 :weight bold))))
`(sp-show-pair-match-face ((t (:background ,zenburn-bg+3 :weight bold))))
