--- gforth/history.fs	2000/04/02 20:18:27	1.20
+++ gforth/history.fs	2000/09/23 15:06:00	1.25
@@ -1,6 +1,6 @@
 \ command line edit and history support                 16oct94py
 
-\ Copyright (C) 1995 Free Software Foundation, Inc.
+\ Copyright (C) 1995,2000 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -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
 
@@ -204,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 ;
@@ -230,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