Merge branch 'master' of git://factorcode.org/git/factor

core/bootstrap/stage2.factor

@@ -88,5 +88,7 @@ IN: bootstrap.stage2
         "output-image" get resource-path save-image-and-exit
     ] if
 ] [
-    print-error :c "listener" vocab-main execute 1 exit
+    print-error :c restarts.
+    "listener" vocab-main execute
+    1 exit
 ] recover

extra/state-parser/state-parser.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2006 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io io.streams.string kernel math namespaces sequences
-strings circular prettyprint debugger unicode.categories ;
+strings circular prettyprint debugger ascii ;
 IN: state-parser
 
 ! * Basic underlying words

extra/trees/splay/splay.factor

@@ -7,7 +7,7 @@ IN: trees.splay
 TUPLE: splay ;
 
 : <splay> ( -- splay-tree )
-    splay construct-tree ;
+    \ splay construct-tree ;
 
 INSTANCE: splay tree-mixin
 

extra/xml/xml.factor

@@ -3,7 +3,7 @@
 USING: io io.streams.string io.files kernel math namespaces
 prettyprint sequences arrays generic strings vectors
 xml.char-classes xml.data xml.errors xml.tokenize xml.writer
-xml.utilities state-parser assocs unicode.categories ;
+xml.utilities state-parser assocs ascii ;
 IN: xml
 
 !   -- Overall parser with data tree