--- gforth/history.fs	2006/05/01 09:45:56	1.48
+++ gforth/history.fs	2007/05/05 17:30:23	1.53
@@ -1,6 +1,6 @@
 \ command line edit and history support                 16oct94py
 
-\ Copyright (C) 1995,2000,2003,2004,2005 Free Software Foundation, Inc.
+\ Copyright (C) 1995,2000,2003,2004,2005,2006 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -198,14 +198,32 @@ require utf-8.fs
 
 [IFUNDEF] #esc  27 Constant #esc  [THEN]
 
-: save-cursor ( -- )  #esc emit '7 emit ;
-: restore-cursor ( -- )  #esc emit '8 emit ;
+Variable curpos
+
+: at-xy? ( -- x y )
+    key? drop
+    #esc emit ." [6n"  0 0
+    BEGIN  key dup 'R <>  WHILE
+	    dup '; = IF  drop  swap  ELSE
+		dup '0 '9 1+ within  IF  '0 - swap 10 * +  ELSE
+		    drop  THEN  THEN
+    REPEAT  drop 1- swap 1- ;
+: cursor@ ( -- n )  at-xy? form nip * + ;
+: cursor! ( n -- )  form nip /mod at-xy ;
+: cur-correct  ( addr u -- )  x-width curpos @ + cursor@ -
+    form nip >r  r@ 2/ + r@ / r> * negate curpos +! ;
+
+: save-cursor ( -- )  cursor@ curpos ! ;
+: restore-cursor ( -- )  curpos @ cursor! ;
 : .rest ( addr pos1 -- addr pos1 )
-    restore-cursor 2dup type ;
+    key? ?EXIT
+    restore-cursor 2dup type 2dup cur-correct ;
 : .all ( span addr pos1 -- span addr pos1 )
-    restore-cursor >r 2dup swap type r> ;
+    key? ?EXIT
+    restore-cursor >r 2dup swap type 2dup swap cur-correct r> ;
 : xback-restore ( u -- )
-    drop restore-cursor ;
+    drop key? ?EXIT
+    restore-cursor ;
 
 \ 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.
@@ -281,8 +299,8 @@ require utf-8.fs
     ['] xclear-tib   ctrl K bindkey
     ['] xfirst-pos   ctrl A bindkey
     ['] xend-pos     ctrl E bindkey
-    ['] (xenter)     #lf    bindkey
-    ['] (xenter)     #cr    bindkey
+    history IF  ['] (xenter)     #lf    bindkey  THEN
+    history IF  ['] (xenter)     #cr    bindkey  THEN
     ['] xtab-expand  #tab   bindkey
     ['] (xins)       IS insert-char
     ['] kill-prefix  IS everychar
@@ -299,7 +317,7 @@ xchar-history
     ?dup-if
 	\ !! >stderr
         \ history-file type ." : " .error cr
-	drop 2drop
+	drop 2drop 0 to history
 	['] false ['] false ['] (ret)
     else
 	to history