emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix module load order (delay config.el load) #441

Browse source
This commit is contained in:
Henrik Lissner 2018-02-28 17:11:23 -05:00
parent 589108fdb2
commit 0b2548f7b1
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/core-packages.el
View file

@ -308,7 +308,7 @@ MODULES is an malformed plist of modules to load."
(let (init-forms config-forms module file-name-handler-alist)
(let ((modules-dir
(expand-file-name "modules/" (file-name-directory (or load-file-name byte-compile-current-file)))))
(add-to-list 'doom-modules-dirs modules-dir)
(cl-pushnew modules-dir doom-modules-dirs :test #'string=)
(dolist (m modules)
(cond ((keywordp m) (setq module m))
((not module) (error "No namespace specified in `doom!' for %s" m))
@ -323,8 +323,8 @@ MODULES is an malformed plist of modules to load."
(setq doom-modules ',doom-modules
doom-modules-dirs ',doom-modules-dirs)
,@(nreverse init-forms)
(unless noninteractive
,@(nreverse config-forms))))))
(push '(lambda () ,@(nreverse config-forms))
doom--delayed-modules)))))
(defmacro def-package! (name &rest plist)
"A thin wrapper around `use-package'."