diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2019-02-16 16:52:53 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2019-02-16 16:52:53 +0200 |
| commit | 2208c01264cb9fe95c857eb57dafa9ea8570b325 (patch) | |
| tree | a78535ed48c25920339e5d735dbd6e2d7ccde9bf /lisp/startup.el | |
| parent | 6b7b85b60e76c5e867f77387e7c57d49f4c0a2cd (diff) | |
| download | emacs-2208c01264cb9fe95c857eb57dafa9ea8570b325.tar.gz | |
* lisp/startup.el (load--user-init-file): Support early-init.elc as well.
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 55ebd4d38c8..a9b58c5e013 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -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 |