summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1997-04-14 20:57:39 +0000
committerRichard M. Stallman <rms@gnu.org>1997-04-14 20:57:39 +0000
commit88b52bf54e0631505edbaeffa9e74aa9fb9f9af2 (patch)
treec09755c12d9a5e182612ab8a8cc11f84076d5ff8 /lisp/emacs-lisp
parent0a1a8ee95bedd56b4d4696c042adb42e1da48297 (diff)
downloademacs-88b52bf54e0631505edbaeffa9e74aa9fb9f9af2.tar.gz
emacs-88b52bf54e0631505edbaeffa9e74aa9fb9f9af2.tar.bz2
emacs-88b52bf54e0631505edbaeffa9e74aa9fb9f9af2.zip
(edebug-read-and-maybe-wrap-form): Protect
against pathological recursive calls.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/edebug.el10
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