--- gforth/kernel/files.fs	2000/09/12 19:20:06	1.13
+++ gforth/kernel/files.fs	2003/01/19 23:35:34	1.18
@@ -1,6 +1,6 @@
 \ File specifiers                                       11jun93jaw
 
-\ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+\ Copyright (C) 1995-2003 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,7 +16,7 @@
 
 \ 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 4 Constant w/o ( -- fam ) \ file	w-o
 2 Constant r/w ( -- fam ) \ file	r-w
@@ -36,6 +36,7 @@
 
 \ include-file                                         07apr93py
 
+has? new-input 0= [IF]
 : push-file  ( -- )  r>
     #fill-bytes @ >r
     loadline @    >r
@@ -50,13 +51,7 @@
 
 : pop-file   ( throw-code -- throw-code )
   dup IF
-         source >in @ sourceline# sourcefilename
-	 error-stack dup @ dup 1+
-	 max-errors 1- min error-stack !
-	 6 * cells + cell+
-	 5 cells bounds swap DO
-	                    I !
-	 -1 cells +LOOP
+         source >in @ sourceline# sourcefilename >error
   THEN
   r>
   r> >in         !
@@ -85,14 +80,15 @@
 
 : include-file ( i*x wfileid -- j*x ) \ file
     loadfilename# @ >r
-    3 loadfilename# ! \ "\a file/"
+    3 loadfilename# ! \ "*a file*"
     include-file1
     r> loadfilename# !
     throw throw ;
+[THEN]
     
 \ additional words only needed if there is file support
 
-Warnings off
+Redefinitions-start
 
 : ( ( compilation 'ccc<close-paren>' -- ; run-time -- ) \ core,file	paren
     loadfile @ 0= IF  postpone (  EXIT  THEN
@@ -111,4 +107,4 @@ Warnings off
 	THEN
     REPEAT ; immediate
 
-Warnings on
+Redefinitions-end