--- gforth/kernel/vars.fs	2007/02/23 22:33:22	1.45
+++ gforth/kernel/vars.fs	2012/03/15 13:37:25	1.51
@@ -1,12 +1,12 @@
 \ VARS.FS      Kernal variables
 
-\ Copyright (C) 1995,1996,1997,1998,2000,2003,2006 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.
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
 \ GNU General Public License for more details.
 
 \ 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., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
 hex \ everything now hex!                               11may93jaw
 
@@ -46,7 +45,7 @@ has? floating [IF]
 \G @i{c-char} is the character value for a space.
 \ used by docon:, must be constant
 
-has? EC [IF] 40 [ELSE] FF [THEN] Constant /line
+has? EC [IF] 20 cells [ELSE] FF [THEN] Constant /line
 
 has? file [IF]
 40 Constant c/l
@@ -56,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
@@ -123,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]
@@ -200,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]