mirror of
https://github.com/doomemacs/doomemacs
synced 2025-08-03 12:27:26 -05:00
Revert da7f9019
& refactor doom init hooks
This commit is contained in:
@ -56,13 +56,7 @@ non-nil."
|
|||||||
(load! "config" (plist-get plist :path) t)))
|
(load! "config" (plist-get plist :path) t)))
|
||||||
doom-modules)
|
doom-modules)
|
||||||
(load! "config" doom-private-dir t)
|
(load! "config" doom-private-dir t)
|
||||||
(if after-init-time
|
(run-hook-wrapped 'doom-post-init-hook #'doom-try-run-hook))))
|
||||||
(doom|run-post-init-hook)
|
|
||||||
(add-hook 'emacs-startup-hook #'doom|run-post-init-hook)))))
|
|
||||||
|
|
||||||
(defun doom|run-post-init-hook ()
|
|
||||||
"Run `doom-post-init-hook'. That's all."
|
|
||||||
(run-hook-wrapped 'doom-post-init-hook #'doom-try-run-hook))
|
|
||||||
|
|
||||||
|
|
||||||
;;
|
;;
|
||||||
|
@ -498,7 +498,7 @@ frame's window-system, the theme will be reloaded.")
|
|||||||
;;
|
;;
|
||||||
(run-hook-wrapped 'doom-init-ui-hook #'doom-try-run-hook))
|
(run-hook-wrapped 'doom-init-ui-hook #'doom-try-run-hook))
|
||||||
|
|
||||||
(add-hook 'doom-post-init-hook #'doom|init-ui)
|
(add-hook 'emacs-startup-hook #'doom|init-ui)
|
||||||
|
|
||||||
(provide 'core-ui)
|
(provide 'core-ui)
|
||||||
;;; core-ui.el ends here
|
;;; core-ui.el ends here
|
||||||
|
@ -305,7 +305,6 @@ and `doom-exit-window-hook'."
|
|||||||
(if disable
|
(if disable
|
||||||
(advice-remove (car spec) (cdr spec))
|
(advice-remove (car spec) (cdr spec))
|
||||||
(advice-add (car spec) :around (cdr spec)))))
|
(advice-add (car spec) :around (cdr spec)))))
|
||||||
(add-hook 'doom-post-init-hook #'doom|init-switch-hooks)
|
|
||||||
|
|
||||||
(defun doom*load-theme-hooks (theme &rest _)
|
(defun doom*load-theme-hooks (theme &rest _)
|
||||||
"Set up `doom-load-theme-hook' to run after `load-theme' is called."
|
"Set up `doom-load-theme-hook' to run after `load-theme' is called."
|
||||||
@ -448,7 +447,8 @@ to least)."
|
|||||||
|
|
||||||
(require 'core-os)
|
(require 'core-os)
|
||||||
(when (or force-load-core-p (not noninteractive))
|
(when (or force-load-core-p (not noninteractive))
|
||||||
(add-hook 'emacs-startup-hook #'doom|display-benchmark)
|
(add-hook! 'emacs-startup-hook
|
||||||
|
#'(doom|init-switch-hooks doom|display-benchmark))
|
||||||
|
|
||||||
(require 'core-ui)
|
(require 'core-ui)
|
||||||
(require 'core-editor)
|
(require 'core-editor)
|
||||||
|
Reference in New Issue
Block a user