--- gforth/kernel/vars.fs	2011/04/13 20:11:12	1.48
+++ gforth/kernel/vars.fs	2012/03/15 13:37:25	1.51
@@ -1,6 +1,6 @@
 \ VARS.FS      Kernal variables
 
-\ Copyright (C) 1995,1996,1997,1998,2000,2003,2006,2007 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2006,2007,2011 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -55,13 +55,6 @@ has? file [IF]
 
 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 )
 
 $400 Value def#tib
@@ -122,6 +115,16 @@ AUser errorhandler
 
 AUser "error            0 "error !
 
+has? EC 0= [IF]
+    auser holdbufptr
+    here word-pno-size chars allot dup holdbufptr !
+    word-pno-size chars +
+    : holdbuf ( -- addr ) holdbufptr @ ;
+    : holdbuf-end   holdbuf word-pno-size chars + ;
+    auser holdptr dup holdptr a!
+    auser holdend     holdend a!
+[THEN]
+
 has? new-input [IF]
     User current-input
 [ELSE]
@@ -199,7 +202,9 @@ AUser dpp		normal-dp dpp !
 			\ the pointer to the current dictionary pointer
                         \ ist reset to normal-dp on (doerror)
                         \  (i.e. any throw caught by quit)
-AUser LastCFA
+has? ec [IF]
+    AUser LastCFA
+[THEN]
 AUser Last
 
 has? flash [IF]