--- gforth/history.fs	2007/06/30 23:00:14	1.58
+++ gforth/history.fs	2007/07/01 18:32:11	1.60
@@ -205,7 +205,7 @@ Variable screenw
 
 : cygwin? ( -- flag ) s" TERM" getenv s" cygwin" str= ;
 : at-xy? ( -- x y )
-    key? drop
+    key? drop \ make sure prep_terminal() is executed
     #esc emit ." [6n"  0 0
     BEGIN  key dup 'R <>  WHILE
 	    dup '; = IF  drop  swap  ELSE
@@ -239,7 +239,7 @@ Variable screenw
 
 : xretype ( max span addr pos1 -- max span addr pos1 )
     restore-cursor screenw @ >r save-cursor
-    .all 2 pick r@ / 1+ screenw @ r> - * 0 max spaces .rest false ;
+    .all 2 pick r@ / screenw @ r> - * 0 max spaces .rest false ;
 
 \ In the following, addr max is the buffer, addr span is the current
 \ string in the buffer, and pos1 is the cursor position in the buffer.