--- gforth/history.fs	1999/12/12 18:35:54	1.19
+++ gforth/history.fs	2000/07/31 21:18:10	1.24
@@ -41,16 +41,16 @@ interpret/compile: ctrl  ( "<char>" -- c
 : (ret)  type-rest drop true space ;
 : back  dup  IF  1- #bs emit  ELSE  #bell emit  THEN 0 ;
 : forw 2 pick over <> IF  2dup + c@ emit 1+  ELSE  #bell emit  THEN 0 ;
-: eof  2 pick over or 0=  IF
-        bye
-    ELSE  2 pick over <>
-	IF  forw drop (del)  ELSE  #bell emit  THEN  0
-    THEN ;
+: <del> ( max span addr pos1 -- max span addr pos2 0 )
+  2 pick over <>
+	IF  forw drop (del)  ELSE  #bell emit  THEN  0 ;
+: eof  2 pick over or 0=  IF  bye  ELSE  <del>  THEN ;
 
 ' forw  ctrl F cells ctrlkeys + !
 ' back  ctrl B cells ctrlkeys + !
 ' ?del  ctrl H cells ctrlkeys + !
 ' eof   ctrl D cells ctrlkeys + !
+' <del> ctrl X cells ctrlkeys + !
 
 ' (ins) IS insert-char
 
@@ -111,15 +111,17 @@ s" os-class" environment? [IF] s" unix"
   hist-pos  forward^ 2!
   tuck 2dup type 0 ;
 
-: prev-line  ( max span addr pos1 -- max span addr pos2 false )
-  clear-line  backward^ 2@ forward^ 2!
+: find-prev-line ( max addr -- max span addr pos2 )
+  backward^ 2@ forward^ 2!
   over 2 + negate s>d backward^ 2@ d+ 0. dmax 2dup hist-setpos
   BEGIN
       backward^ 2!   2dup get-line  WHILE
       hist-pos 2dup forward^ 2@ d<  WHILE
       rot drop
-  REPEAT  2drop  THEN
-  tuck 2dup type 0 ;
+  REPEAT  2drop  THEN  tuck ;
+
+: prev-line  ( max span addr pos1 -- max span addr pos2 false )
+    clear-line find-prev-line 2dup type 0 ;
 
 Create lfpad #lf c,
 
@@ -202,8 +204,8 @@ Create prefix-found  0 , 0 ,
     5 pick over 4 pick + prefix-found @ 0<> - < ;
 
 : tab-expand ( max span addr pos1 -- max span addr pos2 0 )
-    kill-expand  2dup extract-word search-prefix
-    tib-full?
+    kill-expand  2dup extract-word dup 0= IF  nip EXIT  THEN
+    search-prefix  tib-full?
     IF    7 emit  2drop  0 0 prefix-found 2!
     ELSE  bounds ?DO  I c@ (ins)  LOOP  THEN
     prefix-found @ IF  bl (ins)  THEN  0 ;
@@ -228,7 +230,8 @@ Create prefix-found  0 , 0 ,
     ['] force-open catch
     ?dup-if
 	\ !! >stderr
-	history-file type ." : " .error cr 2drop
+        \ history-file type ." : " .error cr
+	drop 2drop
 	['] false ['] false ['] (ret)
     else
 	to history