From: Basil L. Contovounesios <contovob@tcd.ie>
Date: Sat, 6 Mar 2021 09:05:49 +0000 (+0000)
Subject: Conditionally use macroexp-file-name in Flymake
X-Git-Tag: emacs-28.0.90~3417
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f2f233d867ac5a81504c62d5fdb45e8c1c04739b;p=emacs.git

Conditionally use macroexp-file-name in Flymake

* lisp/progmodes/flymake.el (flymake-log): Reinstate Emacs 26
support by conditionally using macroexp-file-name which is new in
Emacs 28 (bug#46957).
---

diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index bd308e02203..e7e746b981d 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -287,7 +287,9 @@ LEVEL is passed to `display-warning', which is used to display
 the warning.  If this form is included in a byte-compiled file,
 the generated warning contains an indication of the file that
 generated it."
-  (let* ((compile-file (macroexp-file-name))
+  (let* ((compile-file (or (and (fboundp 'macroexp-file-name)
+                                (macroexp-file-name))
+                           (bound-and-true-p byte-compile-current-file)))
          (sublog (if (and
                       compile-file
                       (not load-file-name))