Make edebug-remove-instrumentation remove macro instrumentation

* lisp/emacs-lisp/edebug.el (edebug-remove-instrumentation):
Macros can also have edebug instrumentation, so remove that as
well (bug#38195).

diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 6b55d7cff03f986e5d6404a03510fcb5a6a130d3..5d527044108b10e5214f577e31344b051d7ef3c6 100644 (file)
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -4580,8 +4580,9 @@ instrumentation for, defaulting to all functions."
     (let ((functions nil))
       (mapatoms
        (lambda (symbol)
-         (when (and (functionp symbol)
-                    (get symbol 'edebug))
+         (when (and (get symbol 'edebug)
+                    (or (functionp symbol)
+                        (macrop symbol)))
            (let ((unwrapped (edebug-unwrap* (symbol-function symbol))))
              (unless (equal unwrapped (symbol-function symbol))
                (push symbol functions)))))