emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: defer UI init a little longer at startup

Browse source 
Fixes a regression introduced in 0bb4d4dfc, which changed how
doom-switch-buffer-hook works, but makes it fire too early during
startup, eagerly loading packages that wait for the first interactively
opened buffer. This moves doom-init-ui-h to
window-buffer-change-functions, which fires once at the end of startup,
when any buffer is displayed for the first time in the session.

Ref 0bb4d4dfcb
This commit is contained in:
Henrik Lissner 2021-10-10 18:58:32 +02:00
parent 1545500db5
commit 114841bfd2
1 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

34
core/core-ui.el
View file

@ -563,7 +563,7 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original
;; Give users a chance to inject their own font logic. ;; Give users a chance to inject their own font logic.
(run-hooks 'after-setting-font-hook)) (run-hooks 'after-setting-font-hook))
(defun doom-init-theme-h () (defun doom-init-theme-h (&rest _)
"Load the theme specified by `doom-theme' in FRAME." "Load the theme specified by `doom-theme' in FRAME."
(when (and doom-theme (not (custom-theme-enabled-p doom-theme))) (when (and doom-theme (not (custom-theme-enabled-p doom-theme)))
(load-theme doom-theme t))) (load-theme doom-theme t)))
@ -589,12 +589,8 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original
;; ;;
;;; Bootstrap ;;; Bootstrap
(defun doom-init-ui-h () (defun doom-init-ui-h (&optional _)
"Initialize Doom's user interface by applying all its advice and hooks." "Initialize Doom's user interface by applying all its advice and hooks."
;; Produce more helpful (and visible) error messages from errors emitted from
;; hooks (particularly mode hooks, that usually go unnoticed otherwise.
(advice-add #'run-hooks :override #'doom-run-hooks)
(doom-run-hooks 'doom-init-ui-hook) (doom-run-hooks 'doom-init-ui-hook)
(add-hook 'kill-buffer-query-functions #'doom-protect-fallback-buffer-h) (add-hook 'kill-buffer-query-functions #'doom-protect-fallback-buffer-h)
@ -609,19 +605,21 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original
;; These should be done as late as possible, as not to prematurely trigger ;; These should be done as late as possible, as not to prematurely trigger
;; hooks during startup. ;; hooks during startup.
(add-hook 'window-buffer-change-functions #'doom-run-switch-buffer-hooks-h) (add-hook 'window-buffer-change-functions #'doom-run-switch-buffer-hooks-h)
(add-hook 'window-selection-change-functions #'doom-run-switch-window-or-frame-hooks-h)) (add-hook 'window-selection-change-functions #'doom-run-switch-window-or-frame-hooks-h)
;; Apply `doom-font' et co ;; Only execute this function once.
(let ((hook (if (daemonp) 'server-after-make-frame-hook))) (remove-hook 'window-buffer-change-functions #'doom-init-ui-h))
(add-hook (or hook 'after-init-hook)
#'doom-init-fonts-h ;; Apply fonts and theme
-100) (let ((hook (if (daemonp)
(add-hook (or hook 'after-init-hook) 'server-after-make-frame-hook
#'doom-init-theme-h 'after-init-hook)))
-90) (add-hook hook #'doom-init-fonts-h -100)
(add-hook (or hook 'window-setup-hook) (add-hook hook #'doom-init-theme-h -90))
#'doom-init-ui-h
100)) ;; Initialize UI as late as possible. `window-buffer-change-functions' runs
;; once, when the scratch/dashboard buffer is first displayed.
(add-hook 'window-buffer-change-functions #'doom-init-ui-h -100)
;; ;;