From: Juanma Barranquero <lekktu@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 59334@debbugs.gnu.org, akrl@sdf.org
Subject: bug#59334: 29.0.50; loading native-compiled init file sets user-init-file to .eln
Date: Fri, 18 Nov 2022 10:05:50 +0100 [thread overview]
Message-ID: <CAAeL0SRUPtm=+q=TvApDFk9cnEHMX-NwaBK7Lqc2dnsgu5-2LA@mail.gmail.com> (raw)
In-Reply-To: <83tu2wbqgk.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 3342 bytes --]
On Fri, Nov 18, 2022 at 9:46 AM Eli Zaretskii <eliz@gnu.org> wrote:
> I thought about a possibility that the session loaded a .eln file, but
> then the user or some Lisp explicitly loaded the .el file by hand.
> I'm not sure in this case the hash table is updated.
That's a whole another problem, isn't it?
On one hand, it would not affect user-init-file, as it's not the usual
startup procedure. And, on the other hand, my patch sets user-init-file to
the source .el, so after reloading that file it would still have the right
value, wouldn't it?
Anyway, here's the reworked patch.
diff --git i/lisp/startup.el w/lisp/startup.el
index 70267fc857..d7d8743336 100644
--- i/lisp/startup.el
+++ w/lisp/startup.el
@@ -1064,17 +1064,25 @@ startup--load-user-init-file
;; If we loaded a compiled file, set `user-init-file' to
;; the source version if that exists.
- (when (equal (file-name-extension user-init-file)
- "elc")
- (let* ((source (file-name-sans-extension user-init-file))
- (alt (concat source ".el")))
- (setq source (cond ((file-exists-p alt) alt)
- ((file-exists-p source) source)
- (t nil)))
- (when source
- (when (file-newer-than-file-p source user-init-file)
- (message "Warning: %s is newer than %s"
- source user-init-file)
- (sit-for 1))
- (setq user-init-file source))))
+ (if (equal (file-name-extension user-init-file) "elc")
+ (let* ((source (file-name-sans-extension user-init-file))
+ (alt (concat source ".el")))
+ (setq source (cond ((file-exists-p alt) alt)
+ ((file-exists-p source) source)
+ (t nil)))
+ (when source
+ (when (file-newer-than-file-p source user-init-file)
+ (message "Warning: %s is newer than %s"
+ source user-init-file)
+ (sit-for 1))
+ (setq user-init-file source)))
+ ;; Else, perhaps the user init file was compiled
+ (when (equal (file-name-extension user-init-file) "eln")
+ (if-let (source (gethash (file-name-nondirectory
user-init-file)
+ comp-eln-to-el-h))
+ ;; source exists or the .eln file would not load
+ (setq user-init-file source)
+ (message "Warning: unknown source file for init file %S"
+ user-init-file)
+ (sit-for 1))))
(when (and load-defaults
The original code is untouched, other than changing `when' to `if'; the
else part deals with the .eln.
I've checked that gethash returns a value, but not for the file's existence
because in that case comp already complains:
2022-11-18 10:01:15+0100 Warning (comp): Cannot look up eln file as no
source file was found for d:/Home/.emacs.d/init.elc
The warning above is only for the unlikely case that user-init-file points
to an .eln but the gethash lookup returns nil.
[-- Attachment #2: Type: text/html, Size: 5082 bytes --]
next prev parent reply other threads:[~2022-11-18 9:05 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-17 9:28 bug#59334: 29.0.50; loading native-compiled init file sets user-init-file to .eln Juanma Barranquero
2022-11-17 12:07 ` Eli Zaretskii
2022-11-17 13:30 ` Juanma Barranquero
2022-11-17 14:00 ` Eli Zaretskii
2022-11-17 20:04 ` Andrea Corallo
2022-11-17 20:09 ` Eli Zaretskii
2022-11-18 2:25 ` Juanma Barranquero
2022-11-18 2:56 ` Juanma Barranquero
2022-11-18 3:03 ` Juanma Barranquero
2022-11-18 7:50 ` Eli Zaretskii
2022-11-18 7:19 ` Eli Zaretskii
2022-11-18 7:27 ` Eli Zaretskii
2022-11-18 7:45 ` Juanma Barranquero
2022-11-18 8:46 ` Eli Zaretskii
2022-11-18 9:05 ` Juanma Barranquero [this message]
2022-11-18 9:08 ` Juanma Barranquero
2022-11-18 12:33 ` Eli Zaretskii
2022-11-18 12:40 ` Juanma Barranquero
2022-11-18 12:50 ` Eli Zaretskii
2022-11-18 13:03 ` Juanma Barranquero
2022-11-18 20:02 ` Andrea Corallo
2022-11-18 10:39 ` Andrea Corallo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAAeL0SRUPtm=+q=TvApDFk9cnEHMX-NwaBK7Lqc2dnsgu5-2LA@mail.gmail.com' \
--to=lekktu@gmail.com \
--cc=59334@debbugs.gnu.org \
--cc=akrl@sdf.org \
--cc=eliz@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).