More robust bootstrap, fix X11 typo

library/bootstrap/boot-stage2.factor

@@ -1,9 +1,12 @@
 ! 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 ;
 
+! 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
@@ -78,4 +81,6 @@ number>string write " ms" print
     "Now, you can run ./f factor.image" print flush
     
     "factor.image" resource-path save-image
+] catch [ print-error listener ] when*
+
 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 ;