--- gforth/glocals.fs	1999/02/03 00:10:21	1.39
+++ gforth/glocals.fs	2000/05/27 09:41:28	1.43
@@ -293,17 +293,19 @@ locals-types definitions
 
 \ you may want to make comments in a locals definitions group:
 ' \ alias \ ( -- ) \ core-ext,block-ext backslash
-\G Line comment: if @code{BLK} contains 0, parse and discard the remainder
-\G of the parse area. Otherwise, parse and discard all subsequent characters in the
-\G parse area corresponding to the current line.
-immediate 
+\G Comment till the end of the line if @code{BLK} contains 0 (i.e.,
+\G while not loading a block), parse and discard the remainder of the
+\G parse area. Otherwise, parse and discard all subsequent characters
+\G in the parse area corresponding to the current line.
+immediate
 
 ' ( alias ( ( compilation 'ccc<close-paren>' -- ; run-time -- ) \ core,file	paren
-\G Comment: parse and discard all subsequent characters in the parse
-\G area until ")" is encountered. During interactive input, an end-of-line
-\G also acts as a comment terminator. For file input, it does not; if the
-\G end-of-file is encountered whilst parsing for the ")" delimiter, Gforth
-\G will generate a warning.
+\G Comment, usually till the next @code{)}: parse and discard all
+\G subsequent characters in the parse area until ")" is
+\G encountered. During interactive input, an end-of-line also acts as
+\G a comment terminator. For file input, it does not; if the
+\G end-of-file is encountered whilst parsing for the ")" delimiter,
+\G Gforth will generate a warning.
 immediate
 
 forth definitions
@@ -322,7 +324,7 @@ also locals-types
 \ the returned nfa denotes a word that produces what W: produces
 \ !! do the whole thing without nextname
     drop nextname
-    ['] W: >name ;
+    ['] W: >head-noprim ;
 
 previous
 
@@ -335,11 +337,13 @@ create new-locals-map ( -- wordlist-map
 ' drop A, \ rehash method
 ' drop A,
 
-slowvoc @
-slowvoc on
-vocabulary new-locals
-slowvoc !
-new-locals-map ' new-locals >body wordlist-map A! \ !! use special access words
+new-locals-map mappedwordlist Constant new-locals-wl
+
+\ slowvoc @
+\ slowvoc on
+\ vocabulary new-locals
+\ slowvoc !
+\ new-locals-map ' new-locals >body wordlist-map A! \ !! use special access words
 
 variable old-dpp
 
@@ -348,7 +352,7 @@ variable old-dpp
     dp old-dpp !
     locals-dp dpp !
     lastxt get-current
-    also new-locals
+    get-order new-locals-wl swap 1+ set-order
     also locals definitions locals-types
     0 TO locals-wordlist
     0 postpone [ ; immediate