emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 3d9a56f: Fix 'early-init-file' value when file is m


From: Eli Zaretskii
Subject: [Emacs-diffs] master 3d9a56f: Fix 'early-init-file' value when file is missing
Date: Sat, 16 Feb 2019 02:16:20 -0500 (EST)

branch: master
commit 3d9a56f00040cbfc8fb92c4379344d7e91e2dff2
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix 'early-init-file' value when file is missing
    
    * lisp/startup.el (command-line): Pass 'early-init.el', with
    an explicit .el extension, to load-user-init-file.
    Reported by Radon Rosborough <address@hidden> in
    http://lists.gnu.org/archive/html/emacs-devel/2019-01/msg00314.html.
---
 lisp/startup.el | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lisp/startup.el b/lisp/startup.el
index f2410f6..112b9b2 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1167,7 +1167,11 @@ please check its value")
   (load-user-init-file
    (lambda ()
      (expand-file-name
-      "early-init"
+      ;; We use an explicit .el extension here to force
+      ;; load-user-init-file to set user-init-file to "early-init.el",
+      ;; with the .el extension, if the file doesn't exist, not just
+      ;; "early-init" without an extension, as it does for ".emacs".
+      "early-init.el"
       (file-name-as-directory
        (concat "~" init-file-user "/.emacs.d")))))
   (setq early-init-file user-init-file)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]