--- gforth/startup.fs	2001/03/28 09:06:57	1.40
+++ gforth/startup.fs	2003/01/20 17:07:38	1.49
@@ -20,7 +20,9 @@
 
 \ don't require except.fs, because except.fs is not in included-files
 \ (see exboot.fs)
-\ require except.fs \ included on command line
+[IFUNDEF] try
+require except.fs \ included on command line
+[THEN]
 
 warnings off
 include search.fs
@@ -33,18 +35,15 @@ include hash.fs
 \ require interpretation.fs
 \ include float.fs
 \ include search.fs
+require compat/strcomp.fs
 include glocals.fs
 require stuff.fs
 include wordinfo.fs
 include vt100.fs
 \ include colorize.fs
-include see.fs
-include see-ext.fs
-require simp-see.fs
 include bufio.fs
-include debug.fs
 include history.fs
-s" os-class" environment? dup [IF] drop s" unix" compare 0= [THEN]
+s" os-class" environment? dup [IF] drop s" unix" str= [THEN]
 [IF]
 include vt100key.fs
 [ELSE]
@@ -56,8 +55,18 @@ require blocks.fs
 require intcomp.fs
 require savesys.fs
 require table.fs
+s" os-class" environment? dup [IF] drop s" unix" str= [THEN]
+[IF]
 require ekey.fs
+[ELSE]
+require dosekey.fs
+[THEN]
+require quotes.fs
+require see.fs
+require see-ext.fs
 require backtrac.fs
+require simp-see.fs
+require debug.fs
 require code.fs
 
 \ define the environmental queries for all the loaded wordsets
@@ -71,7 +80,7 @@ true constant double-ext
 true constant exception
 true constant exception-ext
 true constant facility
-\ !! facility-ext
+true constant facility-ext
 true constant file
 true constant file-ext
 true constant floating
@@ -81,7 +90,7 @@ true constant locals-ext
 true constant memory-alloc
 true constant memory-alloc-ext
 true constant tools
-\ !! tools-ext
+true constant tools-ext
 true constant search-order
 true constant search-order-ext
 true constant string