emacs/protesilaos.modus-themes
1
0
Fork 0
mirror of https://github.com/protesilaos/modus-themes.git synced 2026-09-10 07:16:30 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert 1b66344 and tweak how modus-themes-with-colors binds display spec and 'unspecified'

Browse source 
For some reason the macro was no longer working with commit 1b66344
after I restarted Emacs. Will investigate further. This should
nevertheless be the final commit that fixes all known issues with
modus-themes-with-colors.
This commit is contained in:
Protesilaos Stavrou 2025-11-05 12:39:11 +02:00
parent 5777db8d9b
commit edd5b66833
No known key found for this signature in database
GPG key ID: 99BD6459CD5CA3EA
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
modus-themes.el
View file

@ -7314,27 +7314,28 @@ whose value is another symbol, which ultimately resolves to a string or
(if (stringp (cadr color))
(push color named)
(push color semantic)))
(let ((sorted (seq-uniq
(nconc (nreverse named) (nreverse semantic))
(lambda (elt1 elt2)
(eq (car elt1) (car elt2))))))
(append '((unspecified 'unspecified)) sorted))))
(seq-uniq
(nconc (nreverse named) (nreverse semantic))
(lambda (elt1 elt2)
(eq (car elt1) (car elt2))))))
(defun modus-themes-with-colors-subr (body-function)
"Do the work of `modus-themes-with-colors' for BODY-FUNCTION."
(defun modus-themes-with-colors-subr (expressions)
"Do the work of `modus-themes-with-colors' for EXPRESSIONS."
(condition-case data
(when-let* ((theme (modus-themes-get-current-theme :no-enable)))
(when-let* ((theme (modus-themes-get-current-theme)))
(eval
`(let* (,@(modus-themes--with-colors-resolve-palette-sort
`(let* ((c '((class color) (min-colors 256)))
(unspecified 'unspecified)
,@(modus-themes--with-colors-resolve-palette-sort
(modus-themes--get-theme-palette-subr theme :with-overrides :with-user-palette)))
(funcall ,body-function))
,@expressions)
:lexical))
(error (message "Error in `modus-themes-with-colors': %s" data))))
(defmacro modus-themes-with-colors (&rest body)
"Evaluate BODY with colors from current palette bound."
(declare (indent 0))
`(modus-themes-with-colors-subr (lambda () ,@body)))
`(modus-themes-with-colors-subr ',body))
;;;; Declare all the Modus themes