--- gforth/kernel/vars.fs	2003/10/03 09:14:27	1.36
+++ gforth/kernel/vars.fs	2006/02/26 17:23:47	1.40
@@ -48,15 +48,20 @@ has? floating [IF]
 
 FF Constant /line
 
+has? file [IF]
 40 Constant c/l
 10 Constant l/s
 400 Constant chars/block
+[THEN]
 
 20 8 2* cells + 2 + cell+ constant word-pno-size ( -- u )
+
+has? EC 0= [IF]
 create holdbuf word-pno-size chars allot
 holdbuf word-pno-size chars + aconstant holdbuf-end
 avariable holdptr holdbuf-end holdptr a!
 avariable holdend holdbuf-end holdend a!
+[THEN]
 
 84 constant pad-minsize ( -- u )
 
@@ -69,6 +74,7 @@ $400 Value def#tib
 
 \ initialized by COLD
 
+has? no-userspace 0= [IF]
 Create main-task  has? OS [IF] 100 [ELSE] 40 [THEN] cells dup allot
 
 \ set user-pointer from cross-compiler right
@@ -81,15 +87,16 @@ Variable udp ( -- a-addr ) \ gforth
 AUser next-task        main-task next-task !
 AUser prev-task        main-task prev-task !
 AUser save-task        0 save-task !
+[THEN]
 AUser sp0 ( -- a-addr ) \ gforth
 \G @code{User} variable -- initial value of the data stack pointer.
 \ sp0 is used by douser:, must be user
-    ' sp0 Alias s0 ( -- a-addr ) \ gforth
+\    ' sp0 Alias s0 ( -- a-addr ) \ gforth
 \G OBSOLETE alias of @code{sp0}
 
 AUser rp0 ( -- a-addr ) \ gforth
 \G @code{User} variable -- initial value of the return stack pointer.
-    ' rp0 Alias r0 ( -- a-addr ) \ gforth
+\    ' rp0 Alias r0 ( -- a-addr ) \ gforth
 \G OBSOLETE alias of @code{rp0}
 
 has? floating [IF]
@@ -101,7 +108,7 @@ AUser fp0 ( -- a-addr ) \ gforth
 has? glocals [IF]
 AUser lp0 ( -- a-addr ) \ gforth
 \G @code{User} variable -- initial value of the locals stack pointer.
-    ' lp0 Alias l0 ( -- a-addr ) \ gforth
+\    ' lp0 Alias l0 ( -- a-addr ) \ gforth
 \G OBSOLETE alias of @code{lp0}
 [THEN]
 
@@ -146,7 +153,7 @@ has? file [IF]
  User loadfile          0 loadfile !
 
  2user loadfilename	0 0 loadfilename 2! \ addr u for sourcefilename
-
+     
  User loadline          \ number of the currently interpreted
                         \ (in TIB) line if the interpretation
                         \ is in a textfile
@@ -157,6 +164,9 @@ has? file [IF]
 [THEN]
 [THEN]
 
+ 2user includefilename  0 0 includefilename 2! \ innermost included file
+
+
 User base ( -- a-addr ) \ core
 \G @code{User} variable -- @i{a-addr} is the address of a cell that stores the
 \G number base used by default for number conversion during input and output.