[Emacs-diffs] /srv/bzr/emacs/trunk r111220: lisp/emacs-lisp/edebug.el: Fix previous change.

[Juanma Barranquero]

------------------------------------------------------------
revno: 111220
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Thu 2012-12-13 19:15:42 +0100
message:
  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.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/edebug.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-13 09:48:54 +0000
+++ b/lisp/ChangeLog    2012-12-13 18:15:42 +0000
@@ -1,3 +1,9 @@
+2012-12-13  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * net/tls.el (tls-program): Update customize type.

=== modified file 'lisp/emacs-lisp/edebug.el'
--- a/lisp/emacs-lisp/edebug.el 2012-12-13 09:45:54 +0000
+++ b/lisp/emacs-lisp/edebug.el 2012-12-13 18:15:42 +0000
@@ -4293,14 +4293,11 @@
 (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)