From 0b13525252331a9a2d3212899263427f74994fb7 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 10 Jul 2024 04:21:19 -0400 Subject: [PATCH] fix(lib): avoid writing customized faces to custom.el (take 2) Setting custom--inhibit-theme-enable to t isn't enough, since custom--should-apply-setting will return non-nil if THEME is 'user. Ref: #7929 Amend: 68771150ba3e --- lisp/lib/themes.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/lib/themes.el b/lisp/lib/themes.el index 983c127fc..262db832f 100644 --- a/lisp/lib/themes.el +++ b/lisp/lib/themes.el @@ -6,11 +6,11 @@ (add-hook! 'doom-load-theme-hook (defun doom-apply-customized-faces-h () "Run `doom-customize-theme-hook'." - (letf! (defun custom-push-theme (prop symbol theme mode &optional value) - (funcall custom-push-theme prop symbol theme mode value) - (if (facep symbol) (face-spec-set symbol value t))) - (let ((custom--inhibit-theme-enable t)) - (run-hooks 'doom-customize-theme-hook))))) + (letf! ((#'custom--should-apply-setting #'ignore) + (defun custom-push-theme (prop symbol theme mode &optional value) + (funcall custom-push-theme prop symbol theme mode value) + (if (facep symbol) (face-spec-set symbol value t)))) + (run-hooks 'doom-customize-theme-hook)))) (defun doom--normalize-face-spec (spec) (cond ((listp (car spec))