Fix recursive load errors when an enabled module doesn't exist

This commit is contained in:
Henrik Lissner
2018-03-14 21:21:58 -04:00
parent c54fb7b8c0
commit c760b33212

View File

@ -362,10 +362,11 @@ MODULES is an malformed plist of modules to load."
((let ((submodule (if (listp m) (car m) m)) ((let ((submodule (if (listp m) (car m) m))
(flags (if (listp m) (cdr m)))) (flags (if (listp m) (cdr m))))
(let ((path (doom-module-find-path module submodule))) (let ((path (doom-module-find-path module submodule)))
(when path
(doom-module-set module submodule :flags flags :path path) (doom-module-set module submodule :flags flags :path path)
(push `(let ((doom--current-module ',(cons module submodule))) (push `(let ((doom--current-module ',(cons module submodule)))
(load! init ,path t)) (load! init ,path t))
load-forms)))))) load-forms)))))))
`(let (file-name-handler-alist) `(let (file-name-handler-alist)
(setq doom-modules ',doom-modules) (setq doom-modules ',doom-modules)
(let ((doom--initializing t)) (let ((doom--initializing t))