--- gforth/history.fs	2000/07/31 21:00:26	1.23
+++ gforth/history.fs	2004/12/31 13:23:57	1.37
@@ -1,6 +1,6 @@
 \ command line edit and history support                 16oct94py
 
-\ Copyright (C) 1995 Free Software Foundation, Inc.
+\ Copyright (C) 1995,2000,2003,2004 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,12 +46,7 @@ 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 + !
-
-' (ins) IS insert-char
+: bindkey ( xt key -- )  cells ctrlkeys + ! ;
 
 \ history support                                       16oct94py
 
@@ -69,7 +64,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
@@ -97,8 +92,8 @@ s" os-class" environment? [IF] s" unix"
 : clear-tib ( max span addr pos -- max 0 addr 0 false )
   clear-line 0 tuck dup ;
 
-: hist-pos    ( -- ud )  history file-position throw ;
-: hist-setpos ( ud -- )  history reposition-file throw ;
+: hist-pos    ( -- ud )  history file-position drop ( throw ) ;
+: hist-setpos ( ud -- )  history reposition-file drop ( throw ) ;
 
 : get-line ( addr len -- len' flag )
   swap history read-line throw ;
@@ -126,7 +121,7 @@ Create lfpad #lf c,
 
 : (enter)  ( max span addr pos1 -- max span addr pos2 true )
   >r end^ 2@ hist-setpos
-  2dup swap history write-line throw
+  2dup swap history write-line drop ( throw ) \ don't worry about errors
   hist-pos 2dup backward^ 2! end^ 2!
   r> (ret) ;
 
@@ -143,6 +138,16 @@ Create lfpad #lf c,
 
 Create prefix-found  0 , 0 ,
 
+: sgn ( n -- -1/0/1 )
+ dup 0= IF EXIT THEN  0< 2* 1+ ;
+
+: capscomp  ( c_addr1 u c_addr2 -- n )
+ swap bounds
+ ?DO  dup c@ I c@ <>
+     IF  dup c@ toupper I c@ toupper =
+     ELSE  true  THEN  WHILE  1+  LOOP  drop 0
+ ELSE  c@ toupper I c@ toupper - unloop  THEN  sgn ;
+
 : word-lex ( nfa1 nfa2 -- -1/0/1 )
     dup 0=
     IF
@@ -180,13 +185,15 @@ Create prefix-found  0 , 0 ,
     REPEAT
     drop r> ;
 
+: prefix-off ( -- )  0 0 prefix-found 2! ;
+
 : prefix-string ( addr len nfa -- addr' len' )
     dup prefix-found !  ?dup
     IF
 	name>string rot /string rot drop
 	dup 1+ prefix-found cell+ !
     ELSE
-	2drop s" " prefix-found cell+ off
+	2drop s" " prefix-off
     THEN ;
 
 : search-prefix  ( addr1 len1 -- addr2 len2 )
@@ -203,6 +210,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!
@@ -210,18 +218,41 @@ Create prefix-found  0 , 0 ,
     prefix-found @ IF  bl (ins)  THEN  0 ;
 
 : kill-prefix  ( key -- key )
-  dup #tab <> IF  0 0 prefix-found 2!  THEN ;
+  dup #tab <> IF  prefix-off  THEN ;
+
+[IFUNDEF] everyline defer everyline [THEN]
+
+: 8-bit-io ( -- )
+    ['] forw        ctrl F bindkey
+    ['] back        ctrl B bindkey
+    ['] ?del        ctrl H bindkey
+    ['] eof         ctrl D bindkey
+    ['] <del>       ctrl X bindkey
+    ['] 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
+    ['] (ins)       IS insert-char
+    ['] kill-prefix IS everychar
+    ['] noop        IS everyline
+    [ action-of key ] Literal IS key
+    [ action-of emit ] Literal IS emit ;
+
+\ UTF-8 support
+
+include utf-8.fs
+
+: utf-8-cold ( -- )
+    s" LANG" getenv s" .UTF-8" search nip nip
+    IF  utf-8-io  ELSE  8-bit-io  THEN ;
 
-' kill-prefix IS everychar
+' utf-8-cold INIT8 chained
 
-' 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 + !
+utf-8-cold
 
 \ initializing history
 
@@ -238,11 +269,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 ( -- )