--- gforth/exboot.fs	2000/07/23 19:29:56	1.2
+++ gforth/exboot.fs	2007/12/31 19:02:24	1.12
@@ -1,14 +1,13 @@
-\ ( 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,2004,2007 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,
@@ -17,10 +16,24 @@
 \ 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/.
 
 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