remove recursive error block - gcl.git - GNU Common Lisp

diff --git a/gcl/clcs/gcl_clcs_kcl_cond.lisp b/gcl/clcs/gcl_clcs_kcl_cond.lisp
index 3e05de51a..5de69f86c 100755
--- a/gcl/clcs/gcl_clcs_kcl_cond.lisp
+++ b/gcl/clcs/gcl_clcs_kcl_cond.lisp

@@ -41,10 +41,10 @@

&aux (internal-error-parms

(list error-name correctable function-name

continue-format-control error-format-string)))

- (when (equal internal-error-parms *internal-error-parms*)

- (format t "Universal error handler called recursively ~S~%"

- internal-error-parms)

- (return-from clcs-universal-error-handler))

+ ;; (when (equal internal-error-parms *internal-error-parms*)

+ ;; (format t "Universal error handler called recursively ~S~%"

+ ;; internal-error-parms)

+ ;; (return-from clcs-universal-error-handler))

(let* ((*internal-error-parms* (list error-name correctable function-name

continue-format-control error-format-string))

(e-d (find-internal-error-data error-name)))

diff --git a/gcl/lsp/gcl_serror.lsp b/gcl/lsp/gcl_serror.lsp
index 070919e9a..ddeec150a 100755
--- a/gcl/lsp/gcl_serror.lsp
+++ b/gcl/lsp/gcl_serror.lsp

@@ -148,11 +148,11 @@ signaled at this point in the stack. For the moment the rest of the VARIABLES a

(defun #. (if (boundp '*error-handler-function*) *error-handler-function* 'joe)

(&rest error-handler-args)

- (when (equal error-handler-args *error-handler-args*)

- (format t "Error handler called recursively ~S~%"

- error-handler-args)

- ;; FIXME

- (return-from si::universal-error-handler nil))

+ ;; (when (equal error-handler-args *error-handler-args*)

+ ;; (format t "Error handler called recursively ~S~%"

+ ;; error-handler-args)

+ ;; ;; FIXME

+ ;; (return-from si::universal-error-handler nil))

(let ((*error-handler-args* error-handler-args))

(when *show-all-debug-info*

(si::simple-backtrace)(si::backtrace) (si::break-vs))

@@ -236,4 +236,4 @@ signaled at this point in the stack. For the moment the rest of the VARIABLES a

else

collecting `((typep ,er ',(car v)),@ (cdr v))))))

+