procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/startup.el (load--user-init-file): Support early-init.elc as well.

Browse source
This commit is contained in:
Eli Zaretskii 2019-02-16 16:52:53 +02:00
parent 6b7b85b60e
commit 2208c01264
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lisp/startup.el
View file

@ -906,11 +906,17 @@ init-file, or to a default value if loading is not possible."
;; the name of the file that it loads into
;; `user-init-file'.
(setq user-init-file t)
(load init-file-name 'noerror 'nomessage)
(load (if (equal (file-name-extension init-file-name)
"el")
(file-name-sans-extension init-file-name)
init-file-name)
'noerror 'nomessage)
(when (and (eq user-init-file t) alternate-filename-function)
(load (funcall alternate-filename-function)
'noerror 'nomessage))
(let ((alt-file (funcall alternate-filename-function)))
(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
;; user-init-file conclusively. Don't let it be