--- gforth/startup.fs	2000/07/23 19:29:56	1.34
+++ gforth/startup.fs	2012/07/13 17:54:59	1.83
@@ -1,12 +1,12 @@
 \ startup file
 
-\ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009,2010,2011 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,10 +15,18 @@
 \ GNU General Public License for more details.
 
 \ 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.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
+\ 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]
+
+[IFDEF] throw>error
+    ' throw>error Alias rethrow
+[THEN]
+
 warnings off
 include search.fs
 include environ.fs
@@ -27,20 +35,27 @@ 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
+' usable-dictionary-end @ dodefer: = [if]
+    include glocals.fs
+[else]
+    include glocals-1.60.fs
+[then]
+require float.fs
 require stuff.fs
-include glocals.fs
 include wordinfo.fs
 include vt100.fs
 \ include colorize.fs
-include see.fs
-include see-ext.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]
@@ -52,9 +67,27 @@ 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
-require backtrac.fs
+[ELSE]
+require dosekey.fs
+[THEN]
+require quotes.fs
+require quotedstring.fs
+require parsedto.fs
+require substitute.fs
 require code.fs
+require see.fs
+require see-ext.fs
+require backtrac.fs
+require simp-see.fs
+require debug.fs
+require dis-gdb.fs
+require libcc.fs
+require struct0x.fs
+require prelude.fs
+require str-exec.fs
 
 \ define the environmental queries for all the loaded wordsets
 \ since the blocks wordset is loaded in a single file, its queries
@@ -67,7 +100,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
@@ -77,11 +110,23 @@ 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:ekeys
+' noop alias X:extension-query
+' noop alias X:fp-stack
+' noop alias X:ftrunc
+' noop alias X:number-prefixes
+' noop alias X:parse-name
+' noop alias X:required
+' noop alias X:structures
+' noop alias X:xchar
 set-current
 
 warnings on