Two small fixes

diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index 1f966c1c3602109a33c4b43937157787e75f1b78..82af07ab575dc02a0ce5084e89b9e78c3fc667e3 100644 (file)
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -1,8 +1,12 @@
 - live search: timer delay would be nice
 - help responder has no way to access { "foo" "bar" }
 - httpd search tools
-- condition rethrow restarts broken
-- menus broken (right click, left click another word)
+- hashed generic method dispatch
+- fix this:
+  [ 1 2 3 4 5 6 7 8 9 10 10 10 10 10 10 10 10 10 10 11 11 11 113 ] .
+[ 1 2 3 4 5 6 7 8 9 10 10 10 10 10 10 10 10 10 10 11 11 11 113 
+]
+- prettier printing of hashtable literals, alists, cond, ...
 
 + ui:
 
@@ -67,12 +71,6 @@
 
 + misc:
 
-- hashed generic method dispatch
-- fix this:
-  [ 1 2 3 4 5 6 7 8 9 10 10 10 10 10 10 10 10 10 10 11 11 11 113 ] .
-[ 1 2 3 4 5 6 7 8 9 10 10 10 10 10 10 10 10 10 10 11 11 11 113 
-]
-- prettier printing of hashtable literals, alists, cond, ...
 - minor GC takes too long now, we should card mark code heap
 - buffer-ptr should be an alien
 - swap nappend ==> nappend

diff --git a/library/syntax/parse-stream.factor b/library/syntax/parse-stream.factor
index 159e24b7fafc86b9bdf56a52fb78259234b5f18b..b8d6b47d6c40ca2d0a8516d60ceeacdb5e672469 100644 (file)
--- a/library/syntax/parse-stream.factor
+++ b/library/syntax/parse-stream.factor
@@ -77,7 +77,8 @@ SYMBOL: parse-hook
         dup parsing-file dup record-file\r
         [ ?resource-path <file-reader> ] keep parse-stream\r
     ] [\r
-        over parse-file-restarts condition drop parse-file\r
+        over parse-file-restarts <condition> rethrow drop\r
+        parse-file\r
     ] recover ;\r
 \r
 : run-file ( file -- ) parse-file call ;\r

diff --git a/library/ui/gadgets/menus.factor b/library/ui/gadgets/menus.factor
index 267cb18feae341aee9b9a0df00292d8d3d815787..eae3bb24fa91a9b6c1dd8b0e987c3d979230b9e0 100644 (file)
--- a/library/ui/gadgets/menus.factor
+++ b/library/ui/gadgets/menus.factor
@@ -24,7 +24,7 @@ M: menu-glass layout* gadget-child prefer ;
     ] if ;
 
 \ menu-glass H{
-    { T{ button-up } [ find-world hide-glass ] }
+    { T{ button-up } [ find-world [ hide-glass ] when* ] }
     { T{ drag } [ retarget-drag ] }
 } set-gestures