--- gforth/history.fs	2011/01/01 14:33:03	1.75
+++ gforth/history.fs	2012/04/06 16:50:03	1.78
@@ -1,6 +1,6 @@
 \ command line edit and history support                 16oct94py
 
-\ Copyright (C) 1995,2000,2003,2004,2005,2006,2007,2008,2010 Free Software Foundation, Inc.
+\ Copyright (C) 1995,2000,2003,2004,2005,2006,2007,2008,2010,2011 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -118,10 +118,11 @@ Variable screenw
 \ Create lfpad #lf c,
 
 : (enter)  ( max span addr pos1 -- max span addr pos2 true )
-  >r end^ 2@ hist-setpos
-  2dup swap history write-line drop ( throw ) \ don't worry about errors
-  hist-pos 2dup backward^ 2! end^ 2!
-  r> (ret) ;
+    >r 2dup swap -trailing nip IF
+	end^ 2@ hist-setpos
+	2dup swap history write-line drop
+	hist-pos 2dup backward^ 2! end^ 2!
+    THEN  r> (ret) ;
 
 : extract-word ( addr len -- addr' len' )  dup >r
   BEGIN  1- dup 0>=  WHILE  2dup + c@ bl =  UNTIL  THEN  1+
@@ -232,6 +233,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 ;
@@ -282,10 +285,11 @@ require utf-8.fs
      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
-    2dup swap history write-line drop ( throw ) \ don't worry about errors
-    hist-pos 2dup backward^ 2! end^ 2!
-    r> .all space true ;
+    >r 2dup swap -trailing nip IF
+	end^ 2@ hist-setpos
+	2dup swap history write-line drop ( throw ) \ don't worry about errors
+	hist-pos 2dup backward^ 2! end^ 2!
+    THEN  r> .all space true ;
 
 : xkill-expand ( max span addr pos1 -- max span addr pos2 )
     prefix-found cell+ @ ?dup IF  >r