From d2436650a31585b94d0a651fccc86ba2c0ff8e12 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 16 Feb 2018 02:11:00 -0500 Subject: [PATCH] Move server+benchmark code into doom|finalize --- core/core-packages.el | 7 +------ core/core.el | 7 ++++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/core-packages.el b/core/core-packages.el index f8d327afe..66b6e88ac 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -327,12 +327,7 @@ MODULES is an malformed plist of modules to load." (setq doom-modules ',doom-modules) ,@(nreverse init-forms) (unless noninteractive - ,@(nreverse config-forms) - (when (display-graphic-p) - (require 'server) - (unless (server-running-p) - (server-start))) - (add-hook 'doom-post-init-hook #'doom-packages--display-benchmark))))) + ,@(nreverse config-forms))))) (defmacro def-package! (name &rest plist) "A thin wrapper around `use-package'." diff --git a/core/core.el b/core/core.el index 610cb3336..da0edcbeb 100644 --- a/core/core.el +++ b/core/core.el @@ -184,7 +184,12 @@ ability to invoke the debugger in debug mode." `gc-cons-percentage' and `file-name-handler-alist'." (unless (or (not after-init-time) noninteractive) (dolist (hook '(doom-init-hook doom-post-init-hook)) - (run-hook-wrapped hook #'doom-try-run-hook hook))) + (run-hook-wrapped hook #'doom-try-run-hook hook)) + (when (display-graphic-p) + (require 'server) + (unless (server-running-p) + (server-start))) + (doom-packages--display-benchmark)) ;; If you forget to reset this, you'll get stuttering and random freezes! (setq gc-cons-threshold 16777216