Fix #5000: bad load order for auxiliary fonts

doom-unicode-font, doom-variable-pitch-font, and the fontset settings
were loaded in the wrong order (before the theme, but should be after).
This means the psuedo 'doom' theme that stores these settings are being
loaded too early.
This commit is contained in:
Henrik Lissner 2021-05-07 13:28:47 -04:00
parent b2c4e0f168
commit 578dddd3fe

View file

@ -702,16 +702,16 @@ This offers a moderate boost in startup (or theme switch) time, so long as
(dolist (fn '(switch-to-buffer display-buffer)) (dolist (fn '(switch-to-buffer display-buffer))
(advice-add fn :around #'doom-run-switch-buffer-hooks-a))) (advice-add fn :around #'doom-run-switch-buffer-hooks-a)))
;; Apply `doom-font' et co
(add-hook 'doom-after-init-modules-hook #'doom-init-fonts-h)
;; Apply `doom-theme' ;; Apply `doom-theme'
(add-hook (if (daemonp) (add-hook (if (daemonp)
'after-make-frame-functions 'after-make-frame-functions
'doom-init-ui-hook) 'doom-after-init-modules-hook)
#'doom-init-theme-h) #'doom-init-theme-h)
(add-hook 'window-setup-hook #'doom-init-ui-h) ;; Apply `doom-font' et co
(add-hook 'doom-after-init-modules-hook #'doom-init-fonts-h)
(add-hook 'window-setup-hook #'doom-init-ui-h 'append)
;; ;;