--- gforth/kernel/files.fs	2003/01/20 19:17:59	1.20
+++ gforth/kernel/files.fs	2012/12/31 15:25:19	1.28
@@ -1,12 +1,12 @@
 \ File specifiers                                       11jun93jaw
 
-\ Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2006,2007,2012 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,8 +15,7 @@
 \ 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., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
 4 Constant w/o ( -- fam ) \ file	w-o
 2 Constant r/w ( -- fam ) \ file	r-w
@@ -27,7 +26,7 @@
 
 \ BIN WRITE-LINE                                        11jun93jaw
 
-: write-line ( c-addr u fileid -- ior ) \ file
+: write-line ( c-addr u wfileid -- ior ) \ file
     dup >r write-file
     ?dup IF
 	r> drop EXIT
@@ -37,6 +36,13 @@
 \ include-file                                         07apr93py
 
 has? new-input 0= [IF]
+: loadfilename>r ( addr1 u1 -- R: addr2 u2 )
+    r> loadfilename 2@ 2>r >r
+    loadfilename 2! ;
+
+: r>loadfilename ( R: addr u -- )
+    r> 2r> loadfilename 2! >r ;
+
 : push-file  ( -- )  r>
     #fill-bytes @ >r
     loadline @    >r
@@ -51,7 +57,7 @@ has? new-input 0= [IF]
 
 : pop-file   ( throw-code -- throw-code )
   dup IF
-         source >in @ sourceline# sourcefilename >error
+      input-error-data >error
   THEN
   r>
   r> >in         !
@@ -79,10 +85,9 @@ has? new-input 0= [IF]
     include-file1 throw throw ;
 
 : include-file ( i*x wfileid -- j*x ) \ file
-    loadfilename 2@ 2>r
-    s" *a file*" loadfilename 2! \ "*a file*"
+    s" *a file*" loadfilename>r
     include-file1
-    2r> loadfilename 2!
+    r>loadfilename
     throw throw ;
 [THEN]