From 7005ae13d76e9f3e29de2d3a1f9e4623534d9a20 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 6 Jun 2017 11:43:40 +0200 Subject: [PATCH] Load private init.el before compilation (fix #95) 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. --- core/core-packages.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core-packages.el b/core/core-packages.el index 1207b0617..d2b874d97 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -184,6 +184,7 @@ This aggressively reloads core autoload files." (when (or force-p (not doom-modules)) (setq doom-modules nil) (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 (mapc (lambda (file) (funcall load-fn file t)) (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. (doom-initialize-packages t t) (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)))) (total-success 0) (total-fail 0)