GNU bug report logs - #40636
[PATCH] Fix `eval-after-load' hooks not running on eln files.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 40636 in the body.
You can then email your comments to 40636 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Andrew Whatson <whatson <at> gmail.com>
To: bug-gnu-emacs <at> gnu.org
Cc: Andrew Whatson <whatson <at> gmail.com>
Subject: [PATCH] Fix `eval-after-load' hooks not running on eln files.
Date: Wed, 15 Apr 2020 13:59:25 +1000

After loading, `do-after-load-evaluation' is called with "the absolute
true name of a file just loaded".  The `eval-after-load-helper' hook was
comparing this with `load-file-name' containing the mangled file name,
so never running.

* lisp/subr.el (eval-after-load): Compare against `load-true-file-name'
  to properly detect the loading of native-compiled files.
---
 lisp/subr.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/subr.el b/lisp/subr.el
index f7445d8c25..def2d9b184 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -4603,7 +4603,7 @@ eval-after-load
                  (if (not load-file-name)
                      ;; Not being provided from a file, run func right now.
                      (funcall func)
-                   (let ((lfn load-file-name)
+                   (let ((lfn load-true-file-name)
                          ;; Don't use letrec, because equal (in
                          ;; add/remove-hook) would get trapped in a cycle.
                          (fun (make-symbol "eval-after-load-helper")))
-- 
2.26.1

Message #8 received at 40636 <at> debbugs.gnu.org (full text, mbox):

From: Lars Ingebrigtsen <larsi <at> gnus.org>
To: Andrew Whatson <whatson <at> gmail.com>
Cc: 40636 <at> debbugs.gnu.org
Subject: Re: bug#40636: [PATCH] Fix `eval-after-load' hooks not running on
 eln files.
Date: Sat, 08 Aug 2020 14:53:07 +0200

Andrew Whatson <whatson <at> gmail.com> writes:

> After loading, `do-after-load-evaluation' is called with "the absolute
> true name of a file just loaded".  The `eval-after-load-helper' hook was
> comparing this with `load-file-name' containing the mangled file name,
> so never running.
>
> * lisp/subr.el (eval-after-load): Compare against `load-true-file-name'
>   to properly detect the loading of native-compiled files.

[...]

> -                   (let ((lfn load-file-name)
> +                   (let ((lfn load-true-file-name)

This is for the native-comp branch, I guess?  I had a look at it, and it
looks like a similar patch was applied the same day this bug report was
filed, so I'm closing this bug report.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.