emacs-diffs
[Top][All Lists]
Advanced

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

master 32d76c0: Default the init file to init.el, not init


From: Lars Ingebrigtsen
Subject: master 32d76c0: Default the init file to init.el, not init
Date: Thu, 17 Dec 2020 06:17:33 -0500 (EST)

branch: master
commit 32d76c0cbc32aa8740bf742a0aea05dd92d28275
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Default the init file to init.el, not init
    
    * lisp/startup.el (startup--load-user-init-file): Make the default
    init file be "init.el", not "init" (bug#45197).
---
 lisp/startup.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/startup.el b/lisp/startup.el
index b652977..b1128f6 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -949,10 +949,10 @@ init-file, or to a default value if loading is not 
possible."
 
               (when (and (eq user-init-file t) alternate-filename-function)
                 (let ((alt-file (funcall alternate-filename-function)))
-                  (and (equal (file-name-extension alt-file) "el")
-                       (setq alt-file (file-name-sans-extension alt-file)))
                  (unless init-file-name
                    (setq init-file-name alt-file))
+                  (and (equal (file-name-extension alt-file) "el")
+                       (setq alt-file (file-name-sans-extension alt-file)))
                   (load alt-file 'noerror 'nomessage)))
 
               ;; If we did not find the user's init file, set
@@ -1382,7 +1382,7 @@ please check its value")
          "~/.emacs")))
      (lambda ()
        (expand-file-name
-        "init"
+        "init.el"
         startup-init-directory))
      (not inhibit-default-init))
 



reply via email to

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