From: Andrea Corallo <akrl@sdf.org> Date: Wed, 15 Apr 2020 21:55:30 +0000 (+0100) Subject: * lisp/subr.el (eval-after-load): Make use of load-true-file-name bug#40638 X-Git-Tag: emacs-28.0.90~2727^2~698 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c5ed3a72a8a70931ef9b0f9d69f73ff0fd40cadb;p=emacs.git * lisp/subr.el (eval-after-load): Make use of load-true-file-name bug#40638 --- diff --git a/lisp/subr.el b/lisp/subr.el index f7445d8c25e..c8eb12760c4 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -4600,10 +4600,10 @@ This function makes or adds to an entry on `after-load-alist'." ;; So add an indirection to make sure that `func' is really run ;; "after-load" in case the provide call happens early. (lambda () - (if (not load-file-name) + (if (not load-true-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")))