mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-05 11:21:04 -08:00
Code Issues Projects Releases Wiki Activity

auto upstream

Browse source
This commit is contained in:
Joakim Verona 2012-12-13 19:22:32 +01:00
commit 2f04192867
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
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.

9
lisp/emacs-lisp/edebug.el
View file

@ -4437,14 +4437,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)