--- gforth/glocals.fs	1997/03/11 16:00:39	1.31
+++ gforth/glocals.fs	1997/07/06 15:55:24	1.34
@@ -85,7 +85,7 @@
 \ Currently locals may only be
 \ defined at the outer level and TO is not supported.
 
-require search-order.fs
+require search.fs
 require float.fs
 
 : compile-@local ( n -- ) \ gforth compile-fetch-local
@@ -322,6 +322,7 @@ create new-locals-map ( -- wordlist-map
 ' new-locals-find A,
 ' new-locals-reveal A,
 ' drop A, \ rehash method
+' drop A,
 
 slowvoc @
 slowvoc on
@@ -332,17 +333,18 @@ new-locals-map ' new-locals >body cell+
 variable old-dpp
 
 \ and now, finally, the user interface words
-: { ( -- addr wid 0 ) \ gforth open-brace
+: { ( -- lastxt wid 0 ) \ gforth open-brace
     dp old-dpp !
     locals-dp dpp !
+    lastxt get-current
     also new-locals
-    also get-current locals definitions  locals-types
+    also locals definitions locals-types
     0 TO locals-wordlist
     0 postpone [ ; immediate
 
 locals-types definitions
 
-: } ( addr wid 0 a-addr1 xt1 ... -- ) \ gforth close-brace
+: } ( lastxt wid 0 a-addr1 xt1 ... -- ) \ gforth close-brace
     \ ends locals definitions
     ] old-dpp @ dpp !
     begin
@@ -352,8 +354,8 @@ locals-types definitions
     repeat
     drop
     locals-size @ alignlp-f locals-size ! \ the strictest alignment
-    set-current
     previous previous
+    set-current lastcfa !
     locals-list TO locals-wordlist ;
 
 : -- ( addr wid 0 ... -- ) \ gforth dash-dash