From 6d1512c2e2ccc914769e74c21bb65cafa9d883b3 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 2 Aug 2018 13:53:53 +0200 Subject: [PATCH] Refactor doom/reload + Remove non-interactive use-case (no more relying on the server; too unstable). + Ensure autoloads are properly reloaded (and thus, the load-path is properly repopulated). + Provide feedback when it's finished --- core/autoload/help.el | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/core/autoload/help.el b/core/autoload/help.el index aab7e9dcf..d41dc7662 100644 --- a/core/autoload/help.el +++ b/core/autoload/help.el @@ -234,22 +234,11 @@ necessary), reinistalize doom (via `doom-initialize') and reloads your private init.el and config.el. Then runs `doom-reload-hook'." (interactive "P") (require 'core-cli) - (cond ((and noninteractive (not (daemonp))) - (require 'server) - (if (not (server-running-p)) - (doom-reload-autoloads force-p) - (print! "Reloading active Emacs session...") - (print! - (bold "%%s") - (if (server-eval-at server-name '(doom/reload)) - (green "Done!") - (red "There were issues!"))))) - ((progn - (require 'core-packages) - (doom-reload-autoloads force-p) - (doom-initialize 'force) - (with-demoted-errors "PRIVATE CONFIG ERROR: %s" - (doom-initialize-modules 'force)) - (print! (green "%d packages reloaded" (length package-alist))) - (run-hook-wrapped 'doom-reload-hook #'doom-try-run-hook) - t)))) + (doom-reload-autoloads force-p) + (setq load-path doom-site-load-path) + (let (doom-init-p) + (doom-initialize)) + (with-demoted-errors "PRIVATE CONFIG ERROR: %s" + (doom-initialize-modules 'force)) + (run-hook-wrapped 'doom-reload-hook #'doom-try-run-hook) + (message "Finished!"))