--- gforth/prim	2000/08/17 12:46:57	1.56
+++ gforth/prim	2000/09/09 20:32:58	1.59
@@ -1379,7 +1379,7 @@ c_addr = (Address)CODE_ADDRESS(xt);
     @ ;
 
 >does-code	( xt -- a_addr )		gforth	to_does_code
-""If @i{xt} is the execution token of a defining-word-defined word,
+""If @i{xt} is the execution token of a child of a @code{DOES>} word,
 @i{a-addr} is the start of the Forth code after the @code{DOES>};
 Otherwise @i{a-addr} is 0.""
 a_addr = (Cell *)DOES_CODE(xt);
@@ -1394,16 +1394,16 @@ CACHE_FLUSH(xt,(size_t)PFA(0));
     ! ;
 
 does-code!	( a_addr xt -- )		gforth	does_code_store
-""Create a code field at @i{xt} for a defining-word-defined word; @i{a-addr}
-is the start of the Forth code after @code{DOES>}.""
+""Create a code field at @i{xt} for a child of a @code{DOES>}-word;
+@i{a-addr} is the start of the Forth code after @code{DOES>}.""
 MAKE_DOES_CF(xt, a_addr);
 CACHE_FLUSH(xt,(size_t)PFA(0));
 :
     dodoes: over ! cell+ ! ;
 
 does-handler!	( a_addr -- )	gforth	does_handler_store
-""Create a @code{DOES>}-handler at address @i{a-addr}. Usually, @i{a-addr} points
-just behind a @code{DOES>}.""
+""Create a @code{DOES>}-handler at address @i{a-addr}. Normally,
+@i{a-addr} points just behind a @code{DOES>}.""
 MAKE_DOES_HANDLER(a_addr);
 CACHE_FLUSH((caddr_t)a_addr,DOES_HANDLER_SIZE);
 :
@@ -1646,17 +1646,21 @@ wior = FILEIO(u2<u1 && ferror((FILE *)wf
 if (wior)
   clearerr((FILE *)wfileid);
 
-read-line	( c_addr u1 wfileid -- u2 flag wior )	file	read_line
+(read-line)	( c_addr u1 wfileid -- u2 flag wior u3 )	file	read_line
 #if 1
 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) {
@@ -2286,7 +2290,11 @@ dsystem = timeval2us(&usage.ru_stime);
 struct timeval time1;
 gettimeofday(&time1,NULL);
 duser = timeval2us(&time1);
+#ifndef BUGGY_LONG_LONG
 dsystem = (DCell)0;
+#else
+dsystem=(DCell){0,0};
+#endif
 #endif
 
 \+