(edebug-enter): Don't call the current function being debugged in

pre-command-hook or post-command-hook.

diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index a5acfd5087510cffbafdcf29ab0ac4e2182f83d2..9061751082d01c92adf3eaafae038d64300027c8 100644 (file)
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -1165,6 +1165,10 @@ result of BODY."
       ;; Reset edebug-mode to the initial mode.
       (setq edebug-mode edebug-initial-mode))
   (let* ((edebug-entered t)
+        (pre-command-hook (if (memq edebug-func pre-command-hook)
+                              nil pre-command-hook))
+        (post-command-hook (if (memq edebug-func post-command-hook)
+                               nil post-command-hook))
         (edebug-data  (get edebug-func 'edebug))
         ;; pull out parts of the edebug-data
         (edebug-func-mark (car edebug-data))   ; mark at function start