--- gforth/startup.fs	1995/12/23 16:21:59	1.14
+++ gforth/startup.fs	2005/03/25 15:53:09	1.59
@@ -1,6 +1,6 @@
 \ startup file
 
-\ Copyright (C) 1995 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,31 +16,64 @@
 
 \ 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)
+[IFUNDEF] try
+require except.fs \ included on command line
+[THEN]
 
+warnings off
+include search.fs
+include environ.fs
+include envos.fs
+include errors.fs
+include extend.fs              \ load core-extended
+include hash.fs
+
+[ifundef] xemit
+    require kernel/xchars.fs
+[then]
+\ require interpretation.fs
 \ include float.fs
-\ include search-order.fs
+\ include search.fs
+require compat/strcomp.fs
 include glocals.fs
-include environ.fs
-\ include toolsext.fs
+require float.fs
+require stuff.fs
 include wordinfo.fs
 include vt100.fs
 \ include colorize.fs
-include see.fs
 include bufio.fs
-include debug.fs
+require utf-8.fs
 include history.fs
-\ include doskey.fs
+s" os-class" environment? dup [IF] drop s" unix" str= [THEN]
+[IF]
 include vt100key.fs
-require debugging.fs
+[ELSE]
+include doskey.fs
+[THEN]
+require debugs.fs
 require assert.fs
 require blocks.fs
-require dumpimage.fs
-
-0 Value $?
-: sh  '# parse cr system  to $? ;
+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
+require dis-gdb.fs
 
 \ define the environmental queries for all the loaded wordsets
 \ since the blocks wordset is loaded in a single file, its queries
@@ -53,7 +86,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
@@ -63,15 +96,16 @@ 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
 true constant string-ext
+\ extension queries
+' noop alias X:deferred
+' noop alias X:extension-query
 set-current
 
-
-
 warnings on
 
-require site-init.fs
+require siteinit.fs