emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master f2f233d: Conditionally use macroexp-file-name in Flymake


From: Basil L. Contovounesios
Subject: master f2f233d: Conditionally use macroexp-file-name in Flymake
Date: Sat, 6 Mar 2021 04:11:09 -0500 (EST)

branch: master
commit f2f233d867ac5a81504c62d5fdb45e8c1c04739b
Author: Basil L. Contovounesios <contovob@tcd.ie>
Commit: Basil L. Contovounesios <contovob@tcd.ie>

    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).
---
 lisp/progmodes/flymake.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index bd308e0..e7e746b 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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]