From 7ea4b219531b74b3e6c3ddd9ca7bbd129553c536 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 16 Sep 2022 10:29:52 +0200 Subject: [PATCH] fix(cli): remove vestigial doom-initialize-modules calls Fix: #6784 --- lisp/cli/compile.el | 7 ++----- lisp/cli/install.el | 5 ++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/lisp/cli/compile.el b/lisp/cli/compile.el index 3dc9004b0..003255858 100644 --- a/lisp/cli/compile.el +++ b/lisp/cli/compile.el @@ -94,11 +94,8 @@ If RECOMPILE-P is non-nil, only recompile out-of-date files." (doom-log "Reloading Doom in preparation for byte-compilation") ;; But first we must be sure that Doom and your private config have been ;; fully loaded. Which usually aren't so in an noninteractive session. - (let ((load-prefer-newer t) - (noninteractive t)) - (require 'doom-start) - (quiet! (doom-initialize-packages)) - (quiet! (doom-initialize-modules)))) + (let ((load-prefer-newer t)) + (require 'doom-start))) (if (null targets) (print! (item "No targets to %scompile" (if recompile-p "re" ""))) diff --git a/lisp/cli/install.el b/lisp/cli/install.el index 7f83beb4c..41675c039 100644 --- a/lisp/cli/install.el +++ b/lisp/cli/install.el @@ -74,9 +74,8 @@ Change `$DOOMDIR' with the `--doomdir' option, e.g. ("config.el" . ,(doom-path doom-emacs-dir "templates/config.example.el")) ("packages.el" . ,(doom-path doom-emacs-dir "templates/packages.example.el")))))) - ;; In case no init.el was present the first time `doom-initialize-modules' was - ;; called in core.el (e.g. on first install) - (doom-initialize-modules 'force 'no-config) + ;; In case no init.el was present the first time it was loaded. + (doom-load (doom-path doom-user-dir doom-module-init-file) t) ;; Ask if user would like an envvar file generated (if (eq envfile? :no)