From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Tue, 30 Nov 2021 13:38:15 +0000 (+0100)
Subject: Allow inhibiting warnings about obsolete macros again
X-Git-Tag: emacs-29.0.90~3635^2~11
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5fb9a033f896440ffddeb475ee655413eb7f03f2;p=emacs.git

Allow inhibiting warnings about obsolete macros again

* lisp/emacs-lisp/macroexp.el (macroexp-macroexpand): Inhibit
warning if requested (bug#50984).
---

diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index 1e4fdd126cb..66c276e7b78 100644
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -216,10 +216,11 @@ is executed without being compiled first."
         (let* ((fun (car form))
                (obsolete (get fun 'byte-obsolete-info)))
           (macroexp-warn-and-return
-           (macroexp--obsolete-warning
-            fun obsolete
-            (if (symbolp (symbol-function fun))
-                "alias" "macro"))
+           (and (byte-compile-warning-enabled-p 'obsolete fun)
+                (macroexp--obsolete-warning
+                 fun obsolete
+                 (if (symbolp (symbol-function fun))
+                     "alias" "macro")))
            new-form 'obsolete))
       new-form)))