From b63ce9873167a53125044b67a220ed4c60b5ba22 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 29 Dec 2019 18:47:12 -0500 Subject: [PATCH] Add benchmark hook & restore switch earlier If the user wants to remove them for some reason. --- core/core.el | 6 +++++- init.el | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/core.el b/core/core.el index 5f1b21899..964aa479a 100644 --- a/core/core.el +++ b/core/core.el @@ -543,7 +543,11 @@ to least)." (warn "Your Doom core autoloads file is missing")) (unless pkg-autoloads-p (warn "Your package autoloads file is missing")) - (signal 'doom-autoload-error (list "Run `bin/doom refresh' to generate them")))) + (signal 'doom-autoload-error (list "Run `bin/doom refresh' to generate them"))) + + (when doom-interactive-mode + (add-hook 'window-setup-hook #'doom-display-benchmark-h 'append) + (add-to-list 'command-switch-alist (cons "--restore" #'doom-restore-session-handler)))) t)) (defun doom-initialize-core () diff --git a/init.el b/init.el index c1b8d7674..13ed45647 100644 --- a/init.el +++ b/init.el @@ -50,6 +50,4 @@ (if noninteractive (doom-initialize-packages) (doom-initialize-core) - (doom-initialize-modules) - (add-hook 'window-setup-hook #'doom-display-benchmark-h) - (add-to-list 'command-switch-alist (cons "--restore" #'doom-restore-session-handler))) + (doom-initialize-modules))