(top-repl): Use 2 as the limit when saving the stack.

(error-catching-loop): use call-with-blocked-asyncs and
call-with-unblocked-asyncs instead of mask-signals and unmask-signals.

diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm
index c1a03f0..f3d50b7 100644 (file)
--- a/ice-9/boot-9.scm
+++ b/ice-9/boot-9.scm
@@ -2122,8 +2122,7 @@
                    (lambda ()
                      (lazy-catch #t
                                  (lambda ()
-                                   (dynamic-wind
-                                    (lambda () (unmask-signals))
+                                   (call-with-unblocked-asyncs
                                     (lambda ()
                                       (with-traps
                                        (lambda ()
@@ -2137,8 +2136,7 @@
                                          (set! first #f)
                                          (let loop ((v (thunk)))
                                            (loop (thunk)))
-                                         #f)))
-                                    (lambda () (mask-signals))))
+                                         #f)))))
 
                                  lazy-handler-dispatch))
 
@@ -2194,7 +2192,8 @@
                                   (#t
                                    (error "sorry, not implemented")))))
     (set! batch-mode? (lambda () (not interactive)))
-    (loop (lambda () #t))))
+    (call-with-blocked-asyncs
+     (lambda () (loop (lambda () #t))))))
 
 ;;(define the-last-stack (make-fluid)) Defined by scm_init_backtrace ()
 (define before-signal-stack (make-fluid))
@@ -2872,7 +2871,7 @@
                                    ;; Make a backup copy of the stack
                                    (fluid-set! before-signal-stack
                                                (fluid-ref the-last-stack))
-                                   (save-stack 1)
+                                   (save-stack 2)
                                    (scm-error 'signal
                                               #f
                                               msg