From da383aeb8e629f642b46e9c64b2ffcec9976c23f Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sat, 6 Mar 2021 09:55:30 -0500 Subject: [PATCH] * lisp/progmodes/flymake.el (flymake-log): Simplify --- lisp/progmodes/flymake.el | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el index e7e746b981d..e9b2b8a77c1 100644 --- a/lisp/progmodes/flymake.el +++ b/lisp/progmodes/flymake.el @@ -284,15 +284,14 @@ If set to nil, don't suppress any zero counters." (defmacro flymake-log (level msg &rest args) "Log, at level LEVEL, the message MSG formatted with ARGS. LEVEL is passed to `display-warning', which is used to display -the warning. If this form is included in a byte-compiled file, +the warning. If this form is included in a file, the generated warning contains an indication of the file that generated it." - (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)) + (let* ((file (if (fboundp 'macroexp-file-name) + (macroexp-file-name) + (and (not load-file-name) + (bound-and-true-p byte-compile-current-file)))) + (sublog (if file (intern (file-name-nondirectory (file-name-sans-extension compile-file)))))) -- 2.39.2