--- gforth/Attic/kernel.fs	1996/10/03 16:05:35	1.7
+++ gforth/Attic/kernel.fs	1996/12/28 17:19:25	1.9
@@ -1359,9 +1359,9 @@ Defer key ( -- c ) \ core
   1 loadline +!
   swap #tib ! 0 >in ! ;
 
-: Query  ( -- ) \ core-ext
+: query   ( -- ) \ core-ext
     \G obsolescent
-    loadfile off  blk off  refill drop ;
+    tib /line accept #tib ! 0 >in ! ;
 
 \ File specifiers                                       11jun93jaw
 
@@ -1615,7 +1615,9 @@ create image-included-files  1 , A, ( po
 Defer 'quit
 Defer .status
 : prompt        state @ IF ."  compiled" EXIT THEN ."  ok" ;
-: (quit)        BEGIN .status cr query interpret prompt AGAIN ;
+: (Query)  ( -- )
+    loadfile off  blk off  refill drop ;
+: (quit)        BEGIN .status cr (query) interpret prompt AGAIN ;
 ' (quit) IS 'quit
 
 \ DOERROR (DOERROR)                                     13jun93jaw
@@ -1812,8 +1814,12 @@ Defer 'cold ' noop IS 'cold
 
 : boot ( path **argv argc -- )
   argc ! argv ! pathstring 2!  main-task up!
-  sp@ dup s0 ! $10 + dup >tib ! tibstack ! #tib off >in off
-  rp@ r0 !  fp@ f0 !  ['] cold catch DoError bye ;
+  sp@ s0 !
+  lp@ forthstart 7 cells + @ - dup >tib ! tibstack ! #tib off >in off
+  rp@ r0 !
+  fp@ f0 !
+  ['] cold catch DoError
+  bye ;
 
 : bye ( -- ) \ tools-ext
     script? 0= IF  cr  THEN  0 (bye) ;