--- gforth/startup.fs	2000/09/12 19:20:06	1.35
+++ gforth/startup.fs	2003/03/09 15:16:55	1.51
@@ -1,6 +1,6 @@
 \ startup file
 
-\ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,11 +16,14 @@
 
 \ You should have received a copy of the GNU General Public License
 \ along with this program; if not, write to the Free Software
-\ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
--2 image-included-files +!
+\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
+\ don't require except.fs, because except.fs is not in included-files
+\ (see exboot.fs)
+[IFUNDEF] try
 require except.fs \ included on command line
+[THEN]
+
 warnings off
 include search.fs
 include environ.fs
@@ -32,17 +35,16 @@ include hash.fs
 \ require interpretation.fs
 \ include float.fs
 \ include search.fs
-require stuff.fs
+require compat/strcomp.fs
 include glocals.fs
+require float.fs
+require stuff.fs
 include wordinfo.fs
 include vt100.fs
 \ include colorize.fs
-include see.fs
-include see-ext.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]
@@ -54,8 +56,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
@@ -69,7 +81,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
@@ -79,7 +91,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