Skip to content

Commit c26eb1d

Browse files
committed
fix(emacs): Ensure the configuration is loaded as well
1 parent 5993cb7 commit c26eb1d

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

lisp/_prepare.el

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,6 +1078,8 @@ This uses function `locate-dominating-file' to look up directory tree."
10781078
(custom-file (locate-user-emacs-file "custom.el")))
10791079
,@body))
10801080

1081+
;; NOTE: If you modified this function, make sure you modified `core/emacs.el'
1082+
;; file as well!
10811083
(defun eask--load-config ()
10821084
"Load configuration if valid."
10831085
(let ((inhibit-config (eask-quick-p)))

lisp/core/emacs.el

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,22 @@
2626

2727
(setq user-emacs-directory (expand-file-name (concat ".eask/" emacs-version "/"))
2828
package-user-dir (expand-file-name "elpa" user-emacs-directory)
29+
early-init-file (locate-user-emacs-file "early-init.el")
30+
eask-dot-emacs-file (locate-user-emacs-file ".emacs")
2931
user-init-file (locate-user-emacs-file "init.el")
3032
custom-file (locate-user-emacs-file "custom.el"))
3133

3234
(package-activate-all)
3335
(ignore-errors (make-directory package-user-dir t))
3436
(eask--silent (eask-setup-paths))
3537

38+
;; NOTE: If you modified this execution, make sure you modified the function
39+
;; `eask--load-config' as well!
40+
(let ((inhibit-config (eask-quick-p)))
41+
(unless inhibit-config
42+
(when (version<= "27" emacs-version)
43+
(load early-init-file t t))
44+
(load eask-dot-emacs-file t t)
45+
(load user-init-file t t)))
46+
3647
;;; core/emacs.el ends here

0 commit comments

Comments
 (0)