Defer lookup of lazy-handler-dispatch.

diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index 2cad1c1..71020ef 100644 (file)
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-19  Neil Jerram  <neil@ossau.uklinux.net>
+
+       * boot-9.scm (error-catching-loop): Defer lookup of
+       lazy-handler-dispatch.
+
 2003-11-17  Marius Vollmer  <mvo@zagadka.de>
 
        * boot-9.scm (@, @@): New macros.

diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm
index 3989f69..d65d99d 100644 (file)
--- a/ice-9/boot-9.scm
+++ b/ice-9/boot-9.scm
@@ -2315,7 +2315,18 @@
                                            (loop (thunk)))
                                          #f)))))
 
-                                 lazy-handler-dispatch))
+                                 ;; Use a closure here rather than
+                                 ;; just `lazy-handler-dispatch' so
+                                 ;; that lookup of
+                                 ;; lazy-handler-dispatch's value is
+                                 ;; deferred until a throw occurs.
+                                 ;; This means that if code executed
+                                 ;; in the REPL just above set!s
+                                 ;; lazy-handler-dispatch, the new
+                                 ;; value will be used to handle the
+                                 ;; next throw from the REPL.
+                                 (lambda args
+                                   (apply lazy-handler-dispatch args))))
 
                    (lambda (key . args)
                      (case key