--- gforth/extend.fs	2000/08/17 12:46:57	1.41
+++ gforth/extend.fs	2000/10/29 20:27:02	1.46
@@ -1,6 +1,6 @@
 \ EXTEND.FS    CORE-EXT Word not fully tested!         12may93jaw
 
-\ Copyright (C) 1995,1998 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1998,2000 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.
 
 
 \ May be cross-compiled
@@ -132,6 +132,7 @@ decimal
 
 \ SOURCE-ID SAVE-INPUT RESTORE-INPUT                    11jun93jaw
 
+[IFUNDEF] source-id
 : source-id ( -- 0 | -1 | fileid ) \ core-ext,file source-i-d
     \G Return 0 (the input source is the user input device), -1 (the
     \G input source is a string being processed by @code{evaluate}) or
@@ -146,7 +147,8 @@ decimal
     >in @
     loadfile @
     if
-	loadfile @ file-position throw #TIB @ 1+ 0 d- \ !! bug for CRLF and EOF
+	loadfile @ file-position throw
+	[IFDEF] #fill-bytes #fill-bytes @ [ELSE] #tib @ 1+ [THEN] 0 d-
     else
 	blk @
 	linestart @
@@ -180,7 +182,7 @@ decimal
     r> loadline !
     >in !
     false ;
-
+[THEN]
 \ This things we don't need, but for being complete... jaw
 
 \ EXPECT SPAN                                           17may93jaw