bug#13163: 24.3.50; Unloading edebug renders Emacs unusable

[Juanma Barranquero <lekktu@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 257 bytes --]

On Wed, Dec 12, 2012 at 11:29 PM, Stephen Berman <stephen.berman@gmx.net> wrote:

> 3. Type `M-x unload-feature RET edebug RET'.
> => Emacs becomes effectively unusable:

Please, try the attached patch and report back any remaining trouble.

TIA,

  Juanma

[-- Attachment #2: edebug.patch --]
[-- Type: application/octet-stream, Size: 1620 bytes --]

=== modified file 'lisp/emacs-lisp/edebug.el'
--- lisp/emacs-lisp/edebug.el	2012-11-20 04:24:09 +0000
+++ lisp/emacs-lisp/edebug.el	2012-12-13 02:33:30 +0000
@@ -4258,12 +4258,13 @@
 ;;; Autoloading of Edebug accessories
 
 ;; edebug-cl-read and cl-read are available from liberte@cs.uiuc.edu
+(defun edebug--require-cl-read ()
+  (require 'edebug-cl-read))
+
 (if (featurep 'cl-read)
-    (add-hook 'edebug-setup-hook
-	      (function (lambda () (require 'edebug-cl-read))))
+    (add-hook 'edebug-setup-hook #'edebug--require-cl-read)
   ;; The following causes edebug-cl-read to be loaded when you load cl-read.el.
-  (add-hook 'cl-read-load-hooks
-	    (function (lambda () (require 'edebug-cl-read)))))
+  (add-hook 'cl-read-load-hooks #'edebug--require-cl-read))
 
 \f
 ;;; Finalize Loading
@@ -4289,6 +4290,24 @@
 ;; Install edebug read and eval functions.
 (edebug-install-read-eval-functions)
 
+(defun edebug-unload-function ()
+  "Unload the Edebug source level debugger."
+  (when edebug-active
+    (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))))
+  (remove-hook 'called-interactively-p-functions
+               'edebug--called-interactively-skip)
+  (remove-hook 'cl-read-load-hooks 'edebug--require-cl-read)
+  (edebug-uninstall-read-eval-functions)
+  ;; continue standard unloading
+  nil)
+
 (provide 'edebug)
 
 ;;; edebug.el ends here