--- gforth/locals.fs	1995/11/07 18:06:48	1.3
+++ gforth/locals.fs	2003/03/22 10:04:07	1.7
@@ -1,6 +1,6 @@
 \ Local primitives                                      17jan92py
 
-\ Copyright (C) 1995 Free Software Foundation, Inc.
+\ Copyright (C) 1995,2000 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,7 +16,7 @@
 
 \ 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 Variable loffset   0 loffset !
 Variable locals  here locals !  100 ( some) cells allot
@@ -35,10 +35,10 @@ Variable locals  here locals !  100 ( so
 
 : <local ( -- sys1 )  current @ @ loffset @ locals @
   over 0= IF  postpone  ralign  THEN  ;                 immediate
-: local: ( -- )  postpone >r  last @ lastcfa @ here locals @ dp !
+: local: ( -- )  postpone >r  latest latestxt here locals @ dp !
   cell loffset +! Create  loffset @ , immediate (local
   here locals !  dp !  lastcfa ! last ! ;               immediate
-: flocal: ( -- )  last @ lastcfa @ here locals @ dp !
+: flocal: ( -- )  latest latestxt here locals @ dp !
   BEGIN  loffset @ 0 1 floats fm/mod drop  WHILE
          0 postpone Literal postpone >r  1 cells  loffset +!  REPEAT
   postpone f>r  Create  loffset @ , immediate (flocal
@@ -83,7 +83,7 @@ Create inlocal  5 cells allot  inlocal o
 : (local)  ( addr u -- )  inlocal @ 0=
   IF  postpone <local inlocal on
       inlocal 3 cells + 2!  inlocal cell+ 2! THEN
-  dup IF    linestart @ >r loadline @ >r loadfile @ >r
+  dup IF    linestart @ >r sourceline# >r loadfile @ >r
             blk @ >r >tib @ >r  #tib @ dup >r  >in @ >r
 
             >tib +! dup #tib ! >tib @ swap move