--- gforth/kernel/files.fs	1998/06/17 16:55:16	1.4
+++ gforth/kernel/files.fs	2000/09/09 20:32:58	1.11
@@ -1,6 +1,6 @@
 \ File specifiers                                       11jun93jaw
 
-\ Copyright (C) 1995-1997 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -32,7 +32,10 @@
     ?dup IF
 	r> drop EXIT
     THEN
-    #lf r> emit-file ;
+    newline r> write-file ;
+
+: read-line ( c_addr u1 wfileid -- u2 flag wior )
+    (read-line) drop ;
 
 \ include-file                                         07apr93py
 
@@ -69,14 +72,25 @@
 : read-loop ( i*x -- j*x )
   BEGIN  refill  WHILE  interpret  REPEAT ;
 
-: include-file ( i*x fid -- j*x ) \ file
-    \G interpret (process using the text interpreter) the contents of
-    \G the file @var{fid}.
+: 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