aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2021-11-30 14:38:15 +0100
committerLars Ingebrigtsen2021-11-30 14:38:15 +0100
commit5fb9a033f896440ffddeb475ee655413eb7f03f2 (patch)
tree5898c169797d52ab4c598ad24a33e28c352888cb
parent5cab2684c07b7a5c241aced2e085b9c1792e4bda (diff)
downloademacs-5fb9a033f896440ffddeb475ee655413eb7f03f2.tar.gz
emacs-5fb9a033f896440ffddeb475ee655413eb7f03f2.zip
Allow inhibiting warnings about obsolete macros again
* lisp/emacs-lisp/macroexp.el (macroexp-macroexpand): Inhibit warning if requested (bug#50984).
-rw-r--r--lisp/emacs-lisp/macroexp.el9
1 files changed, 5 insertions, 4 deletions
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."
216 (let* ((fun (car form)) 216 (let* ((fun (car form))
217 (obsolete (get fun 'byte-obsolete-info))) 217 (obsolete (get fun 'byte-obsolete-info)))
218 (macroexp-warn-and-return 218 (macroexp-warn-and-return
219 (macroexp--obsolete-warning 219 (and (byte-compile-warning-enabled-p 'obsolete fun)
220 fun obsolete 220 (macroexp--obsolete-warning
221 (if (symbolp (symbol-function fun)) 221 fun obsolete
222 "alias" "macro")) 222 (if (symbolp (symbol-function fun))
223 "alias" "macro")))
223 new-form 'obsolete)) 224 new-form 'obsolete))
224 new-form))) 225 new-form)))
225 226