From 578dddd3fed932a1aab5335ce4e8f678008c2e2a Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 7 May 2021 13:28:47 -0400 Subject: [PATCH] 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. --- core/core-ui.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/core-ui.el b/core/core-ui.el index 44b7e9735..26f33c9f8 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -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)) (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' (add-hook (if (daemonp) 'after-make-frame-functions - 'doom-init-ui-hook) + 'doom-after-init-modules-hook) #'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) ;;