--- gforth/prim	2000/09/09 20:32:58	1.59
+++ gforth/prim	2000/09/23 15:46:58	1.63
@@ -1,6 +1,6 @@
 \ Gforth primitives
 
-\ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,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.
 
 
 \ WARNING: This file is processed by m4. Make sure your identifiers
@@ -1646,21 +1646,17 @@ wior = FILEIO(u2<u1 && ferror((FILE *)wf
 if (wior)
   clearerr((FILE *)wfileid);
 
-(read-line)	( c_addr u1 wfileid -- u2 flag wior u3 )	file	read_line
-#if 1
+read-line	( c_addr u1 wfileid -- u2 flag wior )	file	read_line
+""this is only for backward compatibility""
 Cell c;
 flag=-1;
-u3=0;
 for(u2=0; u2<u1; u2++)
 {
    c = getc((FILE *)wfileid);
-   u3++;
    if (c=='\n') break;
    if (c=='\r') {
      if ((c = getc((FILE *)wfileid))!='\n')
        ungetc(c,(FILE *)wfileid);
-     else
-       u3++;
      break;
    }
    if (c==EOF) {
@@ -1670,20 +1666,6 @@ for(u2=0; u2<u1; u2++)
    c_addr[u2] = (Char)c;
 }
 wior=FILEIO(ferror((FILE *)wfileid));
-#else
-if ((flag=FLAG(!feof((FILE *)wfileid) &&
-	       fgets(c_addr,u1+1,(FILE *)wfileid) != NULL))) {
-  wior=FILEIO(ferror((FILE *)wfileid)!=0); /* !! ior? */
-  if (wior)
-    clearerr((FILE *)wfileid);
-  u2 = strlen(c_addr);
-  u2-=((u2>0) && (c_addr[u2-1]==NEWLINE));
-}
-else {
-  wior=0;
-  u2=0;
-}
-#endif
 
 \+
 
@@ -2328,3 +2310,31 @@ for (; ucount>0; ucount--) {
  LOOP 2drop 2drop fdrop ;
 
 \+
+
+\+file
+
+(read-line)	( c_addr u1 wfileid -- u2 flag u3 wior )	file	paren_read_line
+Cell c;
+flag=-1;
+u3=0;
+for(u2=0; u2<u1; u2++)
+{
+   c = getc((FILE *)wfileid);
+   u3++;
+   if (c=='\n') break;
+   if (c=='\r') {
+     if ((c = getc((FILE *)wfileid))!='\n')
+       ungetc(c,(FILE *)wfileid);
+     else
+       u3++;
+     break;
+   }
+   if (c==EOF) {
+	flag=FLAG(u2!=0);
+	break;
+     }
+   c_addr[u2] = (Char)c;
+}
+wior=FILEIO(ferror((FILE *)wfileid));
+
+\+