Ensure we always remove the breakpoint overlays

* lisp/emacs-lisp/edebug.el (edebug--display-1): Remove the
overlays here -- this cleans up after exiting no matter how we
exited.

diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 0c3164b5cb82bbfa167893be419c0bf8f44f0405..9c85ae3dd3d52fb142af3e395c711b8ea590694b 100644 (file)
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -2845,6 +2845,7 @@ See `edebug-behavior-alist' for implementations.")
            (goto-char edebug-buffer-outside-point))
          ;; ... nothing more.
          )
+      (edebug--overlay-breakpoints-remove (point-min) (point-max))
       ;; Could be an option to keep eval display up.
       (if edebug-eval-buffer (kill-buffer edebug-eval-buffer))
       (with-timeout-unsuspend edebug-with-timeout-suspend)
@@ -2944,7 +2945,6 @@ See `edebug-behavior-alist' for implementations.")
            (setq signal-hook-function #'edebug-signal)
            (if edebug-backtrace-buffer
                (kill-buffer edebug-backtrace-buffer))
-            (edebug--overlay-breakpoints-remove (point-min) (point-max))
 
            ;; Remember selected-window after recursive-edit.
            ;;      (setq edebug-inside-window (selected-window))