More robust bootstrap, fix X11 typo

library/bootstrap/boot-stage2.factor

@@ -1,14 +1,17 @@
 ! Copyright (C) 2004, 2006 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: compiler generic help io io-internals kernel
-kernel-internals math memory namespaces optimizer parser
-sequences sequences-internals words ;
+USING: compiler errors generic help io io-internals kernel
+kernel-internals listener math memory namespaces optimizer
+parser sequences sequences-internals words ;
 
-"Cross-referencing..." print flush
-H{ } clone crossref set-global xref-words
-H{ } clone help-graph set-global xref-articles
+! Wrap everything in a catch which starts a listener so you can
+! see what went wrong, instead of dealing with a fep
+[
+    "Cross-referencing..." print flush
+    H{ } clone crossref set-global xref-words
+    H{ } clone help-graph set-global xref-articles
     
-"compile" get [
+    "compile" get [
         "native-io" get [
             unix? [
                 "/library/unix/load.factor" run-resource
@@ -53,29 +56,31 @@ H{ } clone help-graph set-global xref-articles
             "/library/windows/clipboard.factor" run-resource
             compile-all
         ] when
-] when
+    ] when
     
-[
+    [
         boot
         run-user-init
         "shell" get "shells" lookup execute
         0 exit
-] set-boot
+    ] set-boot
     
-[ compiled? ] word-subset length
-number>string write " compiled words" print
+    [ compiled? ] word-subset length
+    number>string write " compiled words" print
     
-[ symbol? ] word-subset length
-number>string write " symbol words" print
+    [ symbol? ] word-subset length
+    number>string write " symbol words" print
     
-all-words length
-number>string write " words total" print 
+    all-words length
+    number>string write " words total" print 
     
-"Total bootstrap GC time: " write gc-time
-number>string write " ms" print
+    "Total bootstrap GC time: " write gc-time
+    number>string write " ms" print
     
-"Bootstrapping is complete." print
-"Now, you can run ./f factor.image" print flush
+    "Bootstrapping is complete." print
+    "Now, you can run ./f factor.image" print flush
+    
+    "factor.image" resource-path save-image
+] catch [ print-error listener ] when*
 
-"factor.image" resource-path save-image
 0 exit

library/ui/x11/utilities.factor

@@ -26,7 +26,7 @@ SYMBOL: root
     
 : with-x ( display-string quot -- )
     [
-        reset-views
+        reset-windows
         swap initialize-x
         [ close-x ] cleanup
     ] with-scope ;