fix(emacs): Ensure the configuration is loaded as well

emacs-eask · Dec 10, 2023 · c26eb1d · c26eb1d
1 parent 5993cb7
commit c26eb1d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/lisp/_prepare.el b/lisp/_prepare.el
@@ -1078,6 +1078,8 @@ This uses function `locate-dominating-file' to look up directory tree."
           (custom-file (locate-user-emacs-file "custom.el")))
      ,@body))
 
+;; NOTE: If you modified this function, make sure you modified `core/emacs.el'
+;; file as well!
 (defun eask--load-config ()
   "Load configuration if valid."
   (let ((inhibit-config (eask-quick-p)))

diff --git a/lisp/core/emacs.el b/lisp/core/emacs.el
@@ -26,11 +26,22 @@
 
 (setq user-emacs-directory (expand-file-name (concat ".eask/" emacs-version "/"))
       package-user-dir (expand-file-name "elpa" user-emacs-directory)
+      early-init-file (locate-user-emacs-file "early-init.el")
+      eask-dot-emacs-file (locate-user-emacs-file ".emacs")
       user-init-file (locate-user-emacs-file "init.el")
       custom-file (locate-user-emacs-file "custom.el"))
 
 (package-activate-all)
 (ignore-errors (make-directory package-user-dir t))
 (eask--silent (eask-setup-paths))
 
+;; NOTE: If you modified this execution, make sure you modified the function
+;; `eask--load-config' as well!
+(let ((inhibit-config (eask-quick-p)))
+  (unless inhibit-config
+    (when (version<= "27" emacs-version)
+      (load early-init-file t t))
+    (load eask-dot-emacs-file t t)
+    (load user-init-file t t)))
+
 ;;; core/emacs.el ends here