--- gforth/history.fs	2008/07/15 16:11:49	1.72
+++ gforth/history.fs	2011/01/29 21:56:47	1.76
@@ -1,6 +1,6 @@
 \ command line edit and history support                 16oct94py
 
-\ Copyright (C) 1995,2000,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc.
+\ Copyright (C) 1995,2000,2003,2004,2005,2006,2007,2008,2010 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -232,6 +232,8 @@ require utf-8.fs
 ' xcur-correct IS cur-correct
 
 : xback-restore ( u -- )
+    dup screenw @ mod 0= IF  1- 0 max  THEN
+    \ correction for line=screenw, no wraparound then!
     screenw @ /mod negate swap negate swap at-deltaxy ;
 : .rest ( addr pos1 -- addr pos1 )
     linew @ xback-restore 2dup type 2dup cur-correct ;
@@ -278,11 +280,8 @@ require utf-8.fs
 : xend-pos  ( max span addr pos1 -- max span addr span 0 )
   drop over .all 0 ;
 
-
-: xclear-line ( max span addr pos1 -- max addr )
-    2dup x-width dup xback-restore dup spaces xback-restore drop nip ;
-: xclear-tib ( max span addr pos -- max 0 addr 0 false )
-    xclear-line 0 tuck dup ;
+: xclear-rest ( max span addr pos -- max pos addr pos false )
+     rot >r tuck 2dup r> swap /string u8width dup spaces linew +! .all 0 ;
 
 : (xenter)  ( max span addr pos1 -- max span addr pos2 true )
     >r end^ 2@ hist-setpos
@@ -295,9 +294,11 @@ require utf-8.fs
 	r@ - >string over r@ + -rot move
 	rot r@ - -rot .all r@ spaces r> back-restore .rest THEN ;
 
+[IFUNDEF] insert
 : insert   ( string length buffer size -- )
     rot over min >r  r@ - ( left over )
     over dup r@ +  rot move   r> move  ;
+[THEN]
 
 : xtab-expand ( max span addr pos1 -- max span addr pos2 0 )
     key? IF  #tab (xins) 0  EXIT  THEN
@@ -316,7 +317,7 @@ require utf-8.fs
     ['] ?xdel        ctrl H bindkey
     ['] xeof         ctrl D bindkey
     ['] <xdel>       ctrl X bindkey
-    ['] xclear-tib   ctrl K bindkey
+    ['] xclear-rest  ctrl K bindkey
     ['] xfirst-pos   ctrl A bindkey
     ['] xend-pos     ctrl E bindkey
     ['] xretype      ctrl L bindkey