Updating Doom Emacs.

.emacs.d/core/autoload/themes.el

@@ -9,6 +9,13 @@
          `((,(car spec) ((t ,(cdr spec))))))
         (`((,(car spec) ,(cdr spec))))))
 
+;;;###autoload
+(defconst doom-customize-theme-hook nil)
+
+(add-hook! 'doom-load-theme-hook :append
+  (defun doom-apply-customized-faces-h ()
+    (run-hooks 'doom-customize-theme-hook)))
+
 ;;;###autoload
 (defmacro custom-theme-set-faces! (theme &rest specs)
   "Apply a list of face SPECS as user customizations for THEME.
@@ -16,26 +23,27 @@
 THEME can be a single symbol or list thereof. If nil, apply these settings to
 all themes. It will apply to all themes once they are loaded."
   (declare (indent defun))
-  `(let ((fn (gensym "doom--customize-themes-h-")))
-     (fset
-      fn (lambda ()
-           (let (custom--inhibit-theme-enable)
-             (dolist (theme (doom-enlist (or ,theme 'user)))
-               (when (or (eq theme 'user)
-                         (custom-theme-enabled-p theme))
-                 (apply #'custom-theme-set-faces theme
-                        (mapcan #'doom--custom-theme-set-face
-                                (list ,@specs))))))))
-     (when (or doom-init-theme-p (null doom-theme))
-       (funcall fn))
-     (add-hook 'doom-load-theme-hook fn 'append)))
+  (let ((fn (gensym "doom--customize-themes-h-")))
+    `(progn
+       (defun ,fn ()
+         (let (custom--inhibit-theme-enable)
+           (dolist (theme (doom-enlist (or ,theme 'user)))
+             (when (or (eq theme 'user)
+                       (custom-theme-enabled-p theme))
+               (apply #'custom-theme-set-faces theme
+                      (mapcan #'doom--custom-theme-set-face
+                              (list ,@specs)))))))
+       (when (or doom-init-theme-p (null doom-theme))
+         (funcall #',fn))
+       (add-hook 'doom-customize-theme-hook #',fn 'append))))
 
 ;;;###autoload
 (defmacro custom-set-faces! (&rest specs)
   "Apply a list of face SPECS as user customizations.
 
-This is a drop-in replacement for `custom-set-face' that allows for a simplified
-face format."
+This is a convenience macro alternative to `custom-set-face' which allows for a
+simplified face format, and takes care of load order issues, so you can use
+doom-themes' API without worry."
   (declare (indent defun))
   `(custom-theme-set-faces! 'user ,@specs))