awesome-emacs/doomemacs
1
0
Fork 0
mirror of https://github.com/doomemacs/doomemacs synced 2025-08-03 12:27:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Henrik Lissner
2018-03-14 21:21:58 -04:00
parent c54fb7b8c0
commit c760b33212
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/core-packages.el
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)))
(doom-module-set module submodule :flags flags :path path) (when path
(push `(let ((doom--current-module ',(cons module submodule))) (doom-module-set module submodule :flags flags :path path)
(load! init ,path t)) (push `(let ((doom--current-module ',(cons module submodule)))
load-forms)))))) (load! init ,path t))
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))