--- gforth/history.fs	1997/09/01 23:07:07	1.15
+++ gforth/history.fs	2000/07/31 21:00:26	1.23
@@ -41,11 +41,10 @@ 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 + !
@@ -63,41 +62,33 @@ interpret/compile: ctrl  ( "<char>" -- c
 2Variable end^
 
 : force-open ( addr len -- fid )
-  2dup r/w open-file 0<
-  IF  drop r/w create-file throw  ELSE  nip nip  THEN ;
-
-: get-history ( addr len -- )
-  force-open to history
-  history file-size throw
-  2dup forward^ 2! 2dup backward^ 2! end^ 2! ;
+    2dup r/w open-file
+    IF
+	drop r/w create-file throw
+    ELSE
+	nip nip
+    THEN ;
 
 s" os-class" environment? [IF] s" unix" compare 0= [ELSE] true [THEN] 
 [IF]
-: history-cold
+: history-file ( -- addr u )
     s" GFORTHHIST" getenv dup 0= IF
 	2drop s" ~/.gforth-history"
-    THEN  get-history ;
+    THEN ;
 [ELSE]
 
-: history-dir
+: history-dir ( -- addr u )
   s" TMP" getenv ?dup ?EXIT drop
   s" TEMP" getenv ?dup ?EXIT drop
   s" c:/" ;
 
-: history-file
+: history-file ( -- addr u )
   s" GFORTHHIST" getenv ?dup ?EXIT
   drop
   history-dir pad place
-  s" /ghist.txt" pad +place pad count ;
-
-: history-cold
-        history-file
-        get-history ;
+  s" /ghist.fs" pad +place pad count ;
 [THEN]
 
-' history-cold INIT8 chained
-history-cold
-
 \ moving in history file                               16oct94py
 
 : clear-line ( max span addr pos1 -- max addr )
@@ -119,15 +110,17 @@ history-cold
   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,
 
@@ -199,7 +192,7 @@ Create prefix-found  0 , 0 ,
 : search-prefix  ( addr1 len1 -- addr2 len2 )
     0 vp dup @ 1- cells over +
     DO  I 2@ <>
-        IF  I cell+ @ @ swap  search-voc  THEN
+        IF  I cell+ @ wordlist-id @ swap  search-voc  THEN
 	[ -1 cells ] Literal +LOOP
     prefix-string ;
 
@@ -210,8 +203,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 ;
@@ -229,3 +222,32 @@ Create prefix-found  0 , 0 ,
 ' (enter)    #lf    cells ctrlkeys + !
 ' (enter)    #cr    cells ctrlkeys + !
 ' tab-expand #tab   cells ctrlkeys + !
+
+\ initializing history
+
+: get-history ( addr len -- )
+    ['] force-open catch
+    ?dup-if
+	\ !! >stderr
+        \ history-file type ." : " .error cr
+	drop 2drop
+	['] false ['] false ['] (ret)
+    else
+	to history
+	history file-size throw
+	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 !
+;
+
+: history-cold ( -- )
+    history-file get-history ;
+
+' history-cold INIT8 chained
+history-cold
+