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

Load private init.el before compilation (fix #95)

Browse source 
Ensures that private settings are available during byte-compilation.

Also fixes a compile error when private init.el (which should be an
optional file) doesn't exist.
This commit is contained in:
Henrik Lissner 2017-06-06 11:43:40 +02:00
parent 2bc7606559
commit 7005ae13d7
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/core-packages.el
View file

@ -184,6 +184,7 @@ This aggressively reloads core autoload files."
(when (or force-p (not doom-modules)) (when (or force-p (not doom-modules))
(setq doom-modules nil) (setq doom-modules nil)
(funcall load-fn (expand-file-name "init.el" doom-emacs-dir)) (funcall load-fn (expand-file-name "init.el" doom-emacs-dir))
(funcall load-fn (doom-module-path :private user-login-name "init.el"))
(when load-p (when load-p
(mapc (lambda (file) (funcall load-fn file t)) (mapc (lambda (file) (funcall load-fn file t))
(append (nreverse (file-expand-wildcards (concat doom-core-dir "core*.el"))) (append (nreverse (file-expand-wildcards (concat doom-core-dir "core*.el")))
@ -503,7 +504,6 @@ If ONLY-RECOMPILE-P is non-nil, only recompile out-of-date files."
;; don't need eval-when-compile and require blocks scattered all over. ;; don't need eval-when-compile and require blocks scattered all over.
(doom-initialize-packages t t) (doom-initialize-packages t t)
(let ((targets (append (list "init.el" doom-core-dir) (let ((targets (append (list "init.el" doom-core-dir)
(list (doom-module-path :private user-login-name "init.el"))
(unless lite-p (doom--module-paths)))) (unless lite-p (doom--module-paths))))
(total-success 0) (total-success 0)
(total-fail 0) (total-fail 0)