--- gforth/startup.fs	2001/03/28 09:06:57	1.40
+++ gforth/startup.fs	2006/12/31 13:39:14	1.64
@@ -1,6 +1,6 @@
 \ startup file
 
-\ Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -20,7 +20,13 @@
 
 \ 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]
+
+[IFDEF] throw>error
+    ' throw>error Alias rethrow
+[THEN]
 
 warnings off
 include search.fs
@@ -30,21 +36,23 @@ 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.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
-require simp-see.fs
 include bufio.fs
-include debug.fs
+require utf-8.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,9 +64,20 @@ 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
+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
@@ -71,7 +90,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,11 +100,17 @@ 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:defined
+' noop alias X:extension-query
+' noop alias X:parse-name
+' noop alias X:required
 set-current
 
 warnings on