From 6f98aeebfbd7e5772b2f104100eda9606dbc7150 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 10 Jun 2018 20:58:00 +0200 Subject: [PATCH] Don't set doom-init-modules-p from doom-modules Causes user config to not be loaded if doom-modules is used earlier. --- core/core-packages.el | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/core/core-packages.el b/core/core-packages.el index 989ea611c..7cd1d292b 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -481,9 +481,12 @@ This doesn't require modules to be enabled. For enabled modules us (defun doom-modules (&optional refresh-p) "Minimally initialize `doom-modules' (a hash table) and return it." - (let ((noninteractive t)) - (doom-initialize-modules refresh-p)) - doom-modules) + (or (unless refresh-p doom-modules) + (let ((noninteractive t) + doom-init-modules-p) + (message "Initializing modules") + (doom-initialize-modules t) + doom-modules))) ;;