diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2020-12-17 12:17:23 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2020-12-17 12:17:23 +0100 |
| commit | 32d76c0cbc32aa8740bf742a0aea05dd92d28275 (patch) | |
| tree | e686cef452766fc38fb0d372193b83479d4ff193 /lisp/startup.el | |
| parent | c51d9140be18697fbff60233d68b18f2f682a3b9 (diff) | |
| download | emacs-32d76c0cbc32aa8740bf742a0aea05dd92d28275.tar.gz emacs-32d76c0cbc32aa8740bf742a0aea05dd92d28275.tar.bz2 emacs-32d76c0cbc32aa8740bf742a0aea05dd92d28275.zip | |
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).
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index b652977798a..b1128f6d02a 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)) |