master ecc2184: Make edebug-remove-instrumentation remove macro instrumentation

[Lars Ingebrigtsen]

branch: master
commit ecc21845eaac931dc12ac5057296fbf742336a02
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    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).
---
 lisp/emacs-lisp/edebug.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 6b55d7c..5d52704 100644
--- 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)))))