--- gforth/kernel/files.fs	1997/05/21 20:40:14	1.1
+++ gforth/kernel/files.fs	2000/09/06 20:30:07	1.10
@@ -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,15 +32,20 @@
     ?dup IF
 	r> drop EXIT
     THEN
-    #lf r> emit-file ;
+    newline r> write-file ;
 
 \ include-file                                         07apr93py
 
 : push-file  ( -- )  r>
-  sourceline# >r  loadfile @ >r
-  blk @ >r  tibstack @ >r  >tib @ >r  #tib @ >r
-  >tib @ tibstack @ = IF  r@ tibstack +!  THEN
-  tibstack @ >tib ! >in @ >r  >r ;
+    loadline @ >r
+    loadfile @ >r
+    blk @      >r
+    tibstack @ >r
+    >tib @     >r
+    #tib @     >r
+    >in @      >r  >r
+    >tib @ tibstack @ = IF  #tib @ tibstack +!  THEN
+    tibstack @ >tib ! ;
 
 : pop-file   ( throw-code -- throw-code )
   dup IF
@@ -53,20 +58,40 @@
 	 -1 cells +LOOP
   THEN
   r>
-  r> >in !  r> #tib !  r> >tib !  r> tibstack !  r> blk !
-  r> loadfile ! r> loadline !  >r ;
+  r> >in      !
+  r> #tib     !
+  r> >tib     !
+  r> tibstack !
+  r> blk      !
+  r> loadfile !
+  r> loadline !  >r ;
 
 : read-loop ( i*x -- j*x )
   BEGIN  refill  WHILE  interpret  REPEAT ;
 
-: include-file ( i*x fid -- j*x ) \ file
-  push-file  loadfile !
-  0 loadline ! blk off  ['] read-loop catch
-  loadfile @ close-file swap 2dup or
-  pop-file  drop throw throw ;
-
+: 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 ;
+
+: 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
+
 : ( ( compilation 'ccc<close-paren>' -- ; run-time -- ) \ core,file	paren
     loadfile @ 0= IF  postpone (  EXIT  THEN
     BEGIN
@@ -84,3 +109,4 @@
 	THEN
     REPEAT ; immediate
 
+Warnings on