--- gforth/kernel/files.fs	2000/05/20 14:25:42	1.8
+++ gforth/kernel/files.fs	2000/09/06 20:30:07	1.10
@@ -18,11 +18,11 @@
 \ along with this program; if not, write to the Free Software
 \ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-4 Constant w/o ( -- ntype ) \ file	w-o
-2 Constant r/w ( -- ntype ) \ file	r-w
-0 Constant r/o ( -- ntype ) \ file	r-o
+4 Constant w/o ( -- fam ) \ file	w-o
+2 Constant r/w ( -- fam ) \ file	r-w
+0 Constant r/o ( -- fam ) \ file	r-o
 
-: bin ( ntype1 -- ntype2 ) \ file
+: bin ( fam1 -- fam2 ) \ file
     1 or ;
 
 \ BIN WRITE-LINE                                        11jun93jaw
@@ -69,14 +69,25 @@
 : read-loop ( i*x -- j*x )
   BEGIN  refill  WHILE  interpret  REPEAT ;
 
-: include-file ( i*x wfileid -- j*x ) \ file
+: include-file1 ( i*x wfileid -- j*x ior1 ior2 )
     \G Interpret (process using the text interpreter) the contents of
     \G the file @var{wfileid}.
     push-file  loadfile !
     0 loadline ! blk off  ['] read-loop catch
     loadfile @ close-file swap 2dup or
-    pop-file  drop throw throw ;
+    pop-file  drop ;
+
+: include-file2 ( i*x wfileid -- j*x )
+    \ like include-file, but does not update loadfile#
+    include-file1 throw throw ;
 
+: include-file ( i*x wfileid -- j*x ) \ file
+    loadfilename# @ >r
+    3 loadfilename# ! \ "\a file/"
+    include-file1
+    r> loadfilename# !
+    throw throw ;
+    
 \ additional words only needed if there is file support
 
 Warnings off