(edebug-read-and-maybe-wrap-form): Protect

against pathological recursive calls.

1 files changed, 6 insertions, 4 deletions

diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index b1c97b24048..74986e81aa2 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -9,7 +9,7 @@
 ;; LCD Archive Entry:
 ;; edebug|Daniel LaLiberte|liberte@cs.uiuc.edu
 ;; |A source level debugger for Emacs Lisp.
-;; |$Date: 1996/12/26 20:46:51 $|$Revision: 3.13 $|~/modes/edebug.el|
+;; |$Date: 1997/04/12 08:30:46 $|$Revision: 3.14 $|~/modes/edebug.el|
 
 ;; This file is part of GNU Emacs.
 
@@ -86,7 +86,7 @@
 ;;; Code:
 
 (defconst edebug-version
-  (let ((raw-version "$Revision: 3.13 $"))
+  (let ((raw-version "$Revision: 3.14 $"))
     (substring raw-version (string-match "[0-9.]*" raw-version)
                (match-end 0))))
      
@@ -1132,8 +1132,10 @@ This controls how we read comma constructs.")
   ;; Here we just catch any no-match not caught below and signal an error.
 
   ;; Run the setup hook.
-  (run-hooks 'edebug-setup-hook)
-  (setq edebug-setup-hook nil)
+  ;; If it gets an error, make it nil.
+  (let ((temp-hook edebug-setup-hook))
+    (setq edebug-setup-hook nil)
+    (run-hooks 'temp-hook))
 
   (let (result
         edebug-top-window-data