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.
This commit is contained in:
Eli Zaretskii 2019-02-16 09:15:40 +02:00
parent f390147f7b
commit 3d9a56f000

View file

@ -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)