Re: [PATCH] Fix `early-init-file' value when file is missing

[Radon Rosborough <radon.neon@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 100 bytes --]

> if you can come up with such a safe change, I will of course gladly
> accept it.

It is attached.

[-- Attachment #1.2: Type: text/html, Size: 161 bytes --]

[-- Attachment #2: 0001-Fix-early-init-file-value-when-file-is-missing.patch --]
[-- Type: application/octet-stream, Size: 2103 bytes --]

From c6c94fe3d04acd21b52d4a85a334dbe6f13c45ff Mon Sep 17 00:00:00 2001
From: Radon Rosborough <radon.neon@gmail.com>
Date: Tue, 12 Feb 2019 18:34:41 -0800
Subject: [PATCH] Fix `early-init-file' value when file is missing

Previously, if no early init-file existed in `user-emacs-directory',
then the value of `early-init-file' after startup would be
~/.emacs.d/early-init (note the missing extension).  This commit
adjusts that value to ~/.emacs.d/early-init.el as desired, while not
changing other behavior.  Note that when the early init-file did
exist, then the value of `early-init-file' after startup was already
correct; this commit fixes a bug that occurred only when the file did
not exist.

lisp/startup.el (load-user-init-file): Update logic.
---
 lisp/startup.el | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/lisp/startup.el b/lisp/startup.el
index f2410f6f2c..eec025f4b6 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -923,7 +923,19 @@ load-user-init-file
               ;; user-init-file conclusively.  Don't let it be
               ;; set from default.el.
               (when (eq user-init-file t)
-                (setq user-init-file init-file-name)))
+                (setq user-init-file
+                      ;; If the init-file doesn't exist, default to
+                      ;; the .el version, not the bare filename.  But
+                      ;; for backwards compatibility, don't do this if
+                      ;; we are using the alternate filename argument
+                      ;; (so we use ~/.emacs instead of ~/.emacs.el,
+                      ;; but ~/.emacs.d/early-init.el instead of
+                      ;; ~/.emacs.d/early-init, by default).
+                      (if alternate-filename-function
+                          init-file-name
+                        (concat
+                         (file-name-sans-extension init-file-name)
+                         ".el")))))
 
             ;; If we loaded a compiled file, set `user-init-file' to
             ;; the source version if that exists.
-- 
2.20.1