From 1b9d2478e33b65ccf5b37574bcb5b88bc2bcaa5c Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Tue, 6 May 2008 02:52:08 -0500
Subject: [PATCH] Bug fixes

---
 core/continuations/continuations-tests.factor |  2 +-
 core/debugger/debugger.factor                 | 16 ++++++----------
 core/listener/listener-tests.factor           |  2 +-
 core/listener/listener.factor                 |  4 +++-
 extra/gap-buffer/tags.txt                     |  2 +-
 extra/ui/tools/listener/listener.factor       |  2 +-
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/core/continuations/continuations-tests.factor b/core/continuations/continuations-tests.factor
index b0c216e82f..996d17077c 100755
--- a/core/continuations/continuations-tests.factor
+++ b/core/continuations/continuations-tests.factor
@@ -39,7 +39,7 @@ IN: continuations.tests
 
 "!!! The following error is part of the test" print
 
-[ ] [ [ [ "2 car" ] eval ] [ print-error ] recover ] unit-test
+[ ] [ [ [ "2 car" ] eval ] try ] unit-test
 
 [ f throw ] must-fail
 
diff --git a/core/debugger/debugger.factor b/core/debugger/debugger.factor
index 64a59fb9be..e5dd02c25e 100755
--- a/core/debugger/debugger.factor
+++ b/core/debugger/debugger.factor
@@ -64,17 +64,13 @@ M: string error. print ;
     [ global [ "Error in print-error!" print drop ] bind ]
     recover ;
 
-SYMBOL: error-hook
-
-[
-    print-error
-    restarts.
-    nl
-    "Type :help for debugging help." print flush
-] error-hook set-global
-
 : try ( quot -- )
-    [ error-hook get call ] recover ;
+    [
+        print-error
+        restarts.
+        nl
+        "Type :help for debugging help." print flush
+    ] recover ;
 
 ERROR: assert got expect ;
 
diff --git a/core/listener/listener-tests.factor b/core/listener/listener-tests.factor
index 2c05c049a7..24449049e0 100755
--- a/core/listener/listener-tests.factor
+++ b/core/listener/listener-tests.factor
@@ -51,6 +51,6 @@ IN: listener.tests
 [
     [ ] [
         "IN: listener.tests : hello\n\"world\" ;" parse-interactive
-    drop
+        drop
     ] unit-test
 ] with-file-vocabs
diff --git a/core/listener/listener.factor b/core/listener/listener.factor
index ff172ccda4..cc4580c2cf 100755
--- a/core/listener/listener.factor
+++ b/core/listener/listener.factor
@@ -43,9 +43,11 @@ M: object stream-read-quot
     "( " in get " )" 3append
     H{ { background { 1 0.7 0.7 1 } } } format bl flush ;
 
+SYMBOL: error-hook
+
 : listen ( -- )
     listener-hook get call prompt.
-    [ read-quot [ try ] [ bye ] if* ]
+    [ read-quot [ [ error-hook get call ] recover ] [ bye ] if* ]
     [
         dup parse-error? [
             error-hook get call
diff --git a/extra/gap-buffer/tags.txt b/extra/gap-buffer/tags.txt
index fd3a2d285a..b5e4471134 100644
--- a/extra/gap-buffer/tags.txt
+++ b/extra/gap-buffer/tags.txt
@@ -1,2 +1,2 @@
 collections
-collections sequences
+sequences
diff --git a/extra/ui/tools/listener/listener.factor b/extra/ui/tools/listener/listener.factor
index 8fed776d5b..484b000861 100755
--- a/extra/ui/tools/listener/listener.factor
+++ b/extra/ui/tools/listener/listener.factor
@@ -128,7 +128,7 @@ TUPLE: stack-display ;
     stack-display new
     g workspace-listener swap [
         dup <toolbar> f track,
-        listener-gadget-stack [ stack. ]
+        stack>> [ [ stack. ] curry try ]
         t "Data stack" <labelled-pane> 1 track,
     ] { 0 1 } build-track ;