--- gforth/kernel/files.fs	2001/09/06 08:11:52	1.17
+++ gforth/kernel/files.fs	2003/03/09 15:17:05	1.22
@@ -1,6 +1,6 @@
 \ File specifiers                                       11jun93jaw
 
-\ Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -37,6 +37,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
@@ -79,10 +86,9 @@ has? new-input 0= [IF]
     include-file1 throw throw ;
 
 : include-file ( i*x wfileid -- j*x ) \ file
-    loadfilename# @ >r
-    3 loadfilename# ! \ "*a file*"
+    s" *a file*" loadfilename>r
     include-file1
-    r> loadfilename# !
+    r>loadfilename
     throw throw ;
 [THEN]