--- gforth/history.fs	2007/10/22 20:30:39	1.66
+++ gforth/history.fs	2008/02/12 16:44:58	1.70
@@ -1,12 +1,12 @@
 \ command line edit and history support                 16oct94py
 
-\ Copyright (C) 1995,2000,2003,2004,2005,2006 Free Software Foundation, Inc.
+\ Copyright (C) 1995,2000,2003,2004,2005,2006,2007 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
 \ GNU General Public License for more details.
 
 \ 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., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
 : ctrl-i ( "<char>" -- c )
     char toupper $40 xor ;
@@ -78,8 +77,7 @@ defer cur-correct ( addr u -- )
 
 Variable linew
 Variable screenw
-
-: linew-off  linew off form nip screenw ! ;
+: linew-off  linew off cols screenw ! ;
 
 [IFDEF] x-width
 : clear-line ( max span addr pos1 -- max addr )
@@ -239,7 +237,7 @@ require utf-8.fs
     linew @ xback-restore >r 2dup swap type 2dup swap cur-correct r> ;
 
 : xretype ( max span addr pos1 -- max span addr pos1 f )
-    .all form nip screenw @ >r screenw !
+    .all cols screenw @ >r screenw !
     linew @ screenw @ / linew @ r@ / max
     screenw @ r> - * 0 max
     dup spaces linew +! .rest false ;
@@ -325,7 +323,9 @@ require utf-8.fs
     ['] xtab-expand  #tab   bindkey
     ['] (xins)       IS insert-char
     ['] kill-prefix  IS everychar
+[ifdef] everyline
     ['] linew-off     IS everyline
+[endif]
     ['] xback-restore IS back-restore
     ['] xcur-correct  IS cur-correct
 ;