diff options
| author | Lars Ingebrigtsen | 2020-12-17 12:17:23 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2020-12-17 12:17:23 +0100 |
| commit | 32d76c0cbc32aa8740bf742a0aea05dd92d28275 (patch) | |
| tree | e686cef452766fc38fb0d372193b83479d4ff193 | |
| parent | c51d9140be18697fbff60233d68b18f2f682a3b9 (diff) | |
| download | emacs-32d76c0cbc32aa8740bf742a0aea05dd92d28275.tar.gz 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).
| -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." | |||
| 949 | 949 | ||
| 950 | (when (and (eq user-init-file t) alternate-filename-function) | 950 | (when (and (eq user-init-file t) alternate-filename-function) |
| 951 | (let ((alt-file (funcall alternate-filename-function))) | 951 | (let ((alt-file (funcall alternate-filename-function))) |
| 952 | (and (equal (file-name-extension alt-file) "el") | ||
| 953 | (setq alt-file (file-name-sans-extension alt-file))) | ||
| 954 | (unless init-file-name | 952 | (unless init-file-name |
| 955 | (setq init-file-name alt-file)) | 953 | (setq init-file-name alt-file)) |
| 954 | (and (equal (file-name-extension alt-file) "el") | ||
| 955 | (setq alt-file (file-name-sans-extension alt-file))) | ||
| 956 | (load alt-file 'noerror 'nomessage))) | 956 | (load alt-file 'noerror 'nomessage))) |
| 957 | 957 | ||
| 958 | ;; If we did not find the user's init file, set | 958 | ;; If we did not find the user's init file, set |
| @@ -1382,7 +1382,7 @@ please check its value") | |||
| 1382 | "~/.emacs"))) | 1382 | "~/.emacs"))) |
| 1383 | (lambda () | 1383 | (lambda () |
| 1384 | (expand-file-name | 1384 | (expand-file-name |
| 1385 | "init" | 1385 | "init.el" |
| 1386 | startup-init-directory)) | 1386 | startup-init-directory)) |
| 1387 | (not inhibit-default-init)) | 1387 | (not inhibit-default-init)) |
| 1388 | 1388 | ||