--- gforth/startup.fs	1997/02/06 21:23:06	1.21
+++ gforth/startup.fs	2000/09/23 15:46:59	1.38
@@ -1,6 +1,6 @@
 \ startup file
 
-\ Copyright (C) 1995 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,21 +16,25 @@
 
 \ 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.
+\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
-warnings off
+\ don't require except.fs, because except.fs is not in included-files
+\ (see exboot.fs)
+\ require except.fs \ included on command line
 
+warnings off
+include search.fs
+include environ.fs
+include envos.fs
 include errors.fs
 include extend.fs              \ load core-extended
-\ include tools.fs               \ load tools ( .s dump )
-\ include toolsext.fs
+include hash.fs
 
 \ require interpretation.fs
 \ include float.fs
-\ include search-order.fs
+\ include search.fs
+require stuff.fs
 include glocals.fs
-include environ.fs
-\ include toolsext.fs
 include wordinfo.fs
 include vt100.fs
 \ include colorize.fs
@@ -38,15 +42,22 @@ include see.fs
 include see-ext.fs
 include bufio.fs
 include debug.fs
-require stuff.fs
 include history.fs
-\ include doskey.fs
+s" os-class" environment? dup [IF] drop s" unix" compare 0= [THEN]
+[IF]
 include vt100key.fs
-require debugging.fs
+[ELSE]
+include doskey.fs
+[THEN]
+require debugs.fs
 require assert.fs
 require blocks.fs
 require intcomp.fs
-require dumpimage.fs
+require savesys.fs
+require table.fs
+require ekey.fs
+require backtrac.fs
+require code.fs
 
 \ define the environmental queries for all the loaded wordsets
 \ since the blocks wordset is loaded in a single file, its queries
@@ -76,8 +87,6 @@ true constant string
 true constant string-ext
 set-current
 
-
-
 warnings on
 
-require site-init.fs
+require siteinit.fs