--- gforth/history.fs	2000/07/31 21:00:26	1.23
+++ gforth/history.fs	2002/09/14 08:20:19	1.29
@@ -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.
 
@@ -16,7 +16,7 @@
 
 \ You should have received a copy of the GNU General Public License
 \ along with this program; if not, write to the Free Software
-\ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 :noname
     char [char] @ - ;
@@ -46,10 +46,13 @@ interpret/compile: ctrl  ( "<char>" -- c
 	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 + !
+: bindkey ( xt key -- )  cells ctrlkeys + ! ;
+
+' forw  ctrl F bindkey
+' back  ctrl B bindkey
+' ?del  ctrl H bindkey
+' eof   ctrl D bindkey
+' <del> ctrl X bindkey
 
 ' (ins) IS insert-char
 
@@ -69,7 +72,7 @@ interpret/compile: ctrl  ( "<char>" -- c
 	nip nip
     THEN ;
 
-s" os-class" environment? [IF] s" unix" compare 0= [ELSE] true [THEN] 
+s" os-class" environment? [IF] s" unix" str= [ELSE] true [THEN] 
 [IF]
 : history-file ( -- addr u )
     s" GFORTHHIST" getenv dup 0= IF
@@ -203,6 +206,7 @@ Create prefix-found  0 , 0 ,
     5 pick over 4 pick + prefix-found @ 0<> - < ;
 
 : tab-expand ( max span addr pos1 -- max span addr pos2 0 )
+    key? IF  #tab (ins) 0  EXIT  THEN
     kill-expand  2dup extract-word dup 0= IF  nip EXIT  THEN
     search-prefix  tib-full?
     IF    7 emit  2drop  0 0 prefix-found 2!
@@ -214,14 +218,14 @@ Create prefix-found  0 , 0 ,
 
 ' kill-prefix IS everychar
 
-' next-line  ctrl N cells ctrlkeys + !
-' prev-line  ctrl P cells ctrlkeys + !
-' clear-tib  ctrl K cells ctrlkeys + !
-' first-pos  ctrl A cells ctrlkeys + !
-' end-pos    ctrl E cells ctrlkeys + !
-' (enter)    #lf    cells ctrlkeys + !
-' (enter)    #cr    cells ctrlkeys + !
-' tab-expand #tab   cells ctrlkeys + !
+' next-line  ctrl N bindkey
+' prev-line  ctrl P bindkey
+' clear-tib  ctrl K bindkey
+' first-pos  ctrl A bindkey
+' end-pos    ctrl E bindkey
+' (enter)    #lf    bindkey
+' (enter)    #cr    bindkey
+' tab-expand #tab   bindkey
 
 \ initializing history
 
@@ -238,11 +242,10 @@ Create prefix-found  0 , 0 ,
 	2dup forward^ 2! 2dup backward^ 2! end^ 2!
 	['] next-line ['] prev-line ['] (enter)
     endif
-    dup
-    [ #lf    cells ctrlkeys + ]L !
-    [ #cr    cells ctrlkeys + ]L !
-    [ ctrl P cells ctrlkeys + ]L !
-    [ ctrl N cells ctrlkeys + ]L !
+    dup #lf bindkey
+        #cr bindkey
+     ctrl P bindkey
+     ctrl N bindkey
 ;
 
 : history-cold ( -- )