Simplify core loading process (part 3)

This commit is contained in:
Henrik Lissner 2017-08-08 19:14:10 +02:00
parent dea8c4727b
commit 4addd92c30
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -207,10 +207,11 @@ This aggressively reloads core autoload files."
:error))))))
(when (or force-p (not doom-modules))
(setq doom-modules nil)
(let (noninteractive)
(funcall load-fn (expand-file-name "init.el" doom-emacs-dir))
(funcall load-fn (doom-module-path :private user-login-name "init.el") t))
(funcall load-fn (expand-file-name "init.el" doom-emacs-dir))
(when load-p
(let (noninteractive)
(funcall load-fn (doom-module-path :private user-login-name "init.el") t)
(funcall load-fn (expand-file-name "core.el" doom-core-dir)))
(mapc load-fn (file-expand-wildcards (expand-file-name "autoload/*.el" doom-core-dir))))
(doom|finalize))
(when (or force-p (not doom-packages))