From a3e39093683657d8acf081bcf2ad51a0f7974c18 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 29 Jan 2018 18:06:55 -0500
Subject: [PATCH] Set doom-modules sooner

Fixes module lookups within modules (like featurep!).
---
 core/core-packages.el | 45 +++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/core/core-packages.el b/core/core-packages.el
index 719c2d806..896b37a25 100644
--- a/core/core-packages.el
+++ b/core/core-packages.el
@@ -292,29 +292,28 @@ include all modules, enabled or otherwise."
   "Bootstrap DOOM Emacs.
 
 MODULES is an malformed plist of modules to load."
-  `(let (file-name-handler-alist)
-     ,@(let (init-forms config-forms mode)
-         (dolist (m modules)
-           (cond ((keywordp m) (setq mode m))
-                 ((not mode)   (error "No namespace specified in `doom!' for %s" m))
-                 (t
-                  (let* ((module    mode)
-                         (submodule (if (listp m) (car m) m))
-                         (flags     (if (listp m) (cdr m)))
-                         (path      (doom-module-path module submodule)))
-                    (doom-module-enable module submodule flags)
-                    (push `(load! init   ,path t) init-forms)
-                    (unless noninteractive
-                      (push `(load! config ,path t) config-forms))))))
-         (nconc (nreverse init-forms)
-                (nreverse config-forms)))
-     (setq doom-modules ',doom-modules)
-     (unless noninteractive
-       (when (display-graphic-p)
-         (require 'server)
-         (unless (server-running-p)
-           (server-start)))
-       (add-hook 'doom-post-init-hook #'doom-packages--display-benchmark))))
+  (let (init-forms config-forms mode)
+    (dolist (m modules)
+      (cond ((keywordp m) (setq mode m))
+            ((not mode)   (error "No namespace specified in `doom!' for %s" m))
+            (t
+             (let* ((module    mode)
+                    (submodule (if (listp m) (car m) m))
+                    (flags     (if (listp m) (cdr m)))
+                    (path      (doom-module-path module submodule)))
+               (doom-module-enable module submodule flags)
+               (push `(load! init   ,path t) init-forms)
+               (unless noninteractive
+                 (push `(load! config ,path t) config-forms))))))
+    `(let (file-name-handler-alist)
+       (setq doom-modules ',doom-modules)
+       ,@(nconc (nreverse init-forms) (nreverse config-forms))
+       (unless noninteractive
+         (when (display-graphic-p)
+           (require 'server)
+           (unless (server-running-p)
+             (server-start)))
+         (add-hook 'doom-post-init-hook #'doom-packages--display-benchmark)))))
 
 (defmacro def-package! (name &rest plist)
   "A thin wrapper around `use-package'."