Commit ce0440ff authored by Juanma Barranquero's avatar Juanma Barranquero
Browse files

lisp/emacs-lisp/edebug.el: Fix previous change.

(edebug-unload-function): Make sure that unload-feature finishes even when
aborting an ongoing edebug session.  Also, do not worry about edebug-mode,
unload-feature takes care of it.
parent 893f52d8
2012-12-13 Juanma Barranquero <lekktu@gmail.com>
* emacs-lisp/edebug.el (edebug-unload-function): Make sure that
unload-feature finishes even when aborting an ongoing edebug session.
Also, do not worry about edebug-mode, unload-feature takes care of it.
2012-12-13 Andreas Schwab <schwab@suse.de>
 
* net/tls.el (tls-program): Update customize type.
......
......@@ -4293,14 +4293,11 @@ With prefix argument, make it a temporary breakpoint."
(defun edebug-unload-function ()
"Unload the Edebug source level debugger."
(when edebug-active
(setq edebug-active nil)
(unwind-protect
(abort-recursive-edit)
(setq edebug-active nil)
(edebug-unload-function)))
(save-current-buffer
(dolist (buffer (buffer-list))
(set-buffer buffer)
(when (eq major-mode 'edebug-mode) (emacs-lisp-mode))))
;; We still want to run unload-feature to completion
(run-with-idle-timer 0 nil #'(lambda () (unload-feature 'edebug)))))
(remove-hook 'called-interactively-p-functions
'edebug--called-interactively-skip)
(remove-hook 'cl-read-load-hooks 'edebug--require-cl-read)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment