--- gforth/history.fs	1996/07/16 20:57:10	1.11
+++ gforth/history.fs	1997/12/01 21:15:03	1.16
@@ -22,7 +22,7 @@
     char [char] @ - ;
 :noname
     char [char] @ - postpone Literal ;
-special: ctrl  ( "<char>" -- ctrl-code )
+interpret/compile: ctrl  ( "<char>" -- ctrl-code )
 
 \ command line editing                                  16oct94py
 
@@ -56,28 +56,49 @@ special: ctrl  ( "<char>" -- ctrl-code )
 
 \ history support                                       16oct94py
 
-0 Value history
+0 Value history \ history file fid
 
 2Variable forward^
 2Variable backward^
 2Variable end^
 
-: force-open ( addr len -- handle )
+: force-open ( addr len -- fid )
   2dup r/w open-file 0<
-  IF  drop r/w create-file throw  ELSE  nip nip  THEN ;
+  IF  drop r/w create-file
+      throw  ELSE  nip nip  THEN ;
 
-: get-history ( addr len -- wid )
-  force-open to history
-  history file-size throw
-  2dup forward^ 2! 2dup backward^ 2! end^ 2! ;
+s" os-class" environment? [IF] s" unix" compare 0= [ELSE] true [THEN] 
+[IF]
+: history-file ( -- addr u )
+    s" GFORTHHIST" getenv dup 0= IF
+	2drop s" ~/.gforth-history"
+    THEN ;
+[ELSE]
 
-s" ~/.gforth-history" get-history
+: history-dir ( -- addr u )
+  s" TMP" getenv ?dup ?EXIT drop
+  s" TEMP" getenv ?dup ?EXIT drop
+  s" c:/" ;
+
+: history-file ( -- addr u )
+  s" GFORTHHIST" getenv ?dup ?EXIT
+  drop
+  history-dir pad place
+  s" /ghist.fs" pad +place pad count ;
+[THEN]
+
+: get-history ( addr len -- )
+    ['] force-open catch
+    dup 0< IF  ." can't open " history-file type cr throw  THEN  drop
+    to history
+    history file-size throw
+    2dup forward^ 2! 2dup backward^ 2! end^ 2! ;
 
-: history-cold
-    Defers 'cold
-    s" ~/.gforth-history" get-history ;
+: history-cold ( -- )
+    history-file get-history ;
 
-' history-cold IS 'cold
+' history-cold INIT8 chained
+history-cold
 
 \ moving in history file                               16oct94py