diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2019-02-16 09:15:40 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2019-02-16 09:15:40 +0200 |
| commit | 3d9a56f00040cbfc8fb92c4379344d7e91e2dff2 (patch) | |
| tree | 76d8b3c1302fbeddbb93e07aeab026913f55b589 | |
| parent | f390147f7b815a7e4345caff04f692c6a897a619 (diff) | |
| download | emacs-3d9a56f00040cbfc8fb92c4379344d7e91e2dff2.tar.gz | |
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 <radon.neon@gmail.com> in
http://lists.gnu.org/archive/html/emacs-devel/2019-01/msg00314.html.
| -rw-r--r-- | lisp/startup.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index f2410f6f2c3..112b9b25961 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) |