--- gforth/exboot.fs	2000/05/19 09:24:38	1.1
+++ gforth/exboot.fs	2004/01/19 07:52:32	1.9
@@ -1,8 +1,7 @@
-\ ( n -- ) include exceptions.fs and restart Gforth, ignoring the
-\ first n arguments. Gforth is restarted to create an exception frame
-\ for the exception handler.
+\ include except.fs and restart Gforth. Gforth is restarted to create
+\ an exception frame for the exception handler.
 
-\ Copyright (C) 2000 Free Software Foundation, Inc.
+\ Copyright (C) 2000,2001,2003 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -18,9 +17,24 @@
 
 \ 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.
 
-require exceptions.fs
+require except.fs
 
-included-files 2@ image-included-files 2!
-pathstring 2@ rot argv @ over cells + argc @ rot - boot
+\ the following line would be necessary to get exceptions.fs and
+\ exboot.fs into the included-files.  We would then have to ensure
+\ that image-included-files is reset to the previous state after
+\ booting (by doing "-2 image-included-files +!"), in order to treat
+\ the names correctly on SAVESYSTEM.
+
+\ included-files 2@ image-included-files 2!
+
+\ now boot
+
+pathstring 2@ argv @ argc @
+[defined] next-arg 0= [if]
+    \ for compatibility with old versions
+    swap cell+ swap 1-
+[endif]
+boot
+    
\ No newline at end of file