--- gforth/look.fs	1995/11/07 18:06:48	1.3
+++ gforth/look.fs	1997/03/27 13:31:02	1.7
@@ -28,13 +28,6 @@
 
 decimal
 
-\ >NAME PRIMSTART                                       22may93jaw
-
-\ : >name ( xt -- nfa )
-\         BEGIN   1 chars -
-\                 dup c@ 128 and
-\         UNTIL ;
-
 : PrimStart ['] true >name ;
 
 \ look                                                  17may93jaw
@@ -42,14 +35,17 @@ decimal
 : (look)  ( xt startlfa -- lfa flag )
         false swap
         BEGIN @ dup
-        WHILE dup name>
+        WHILE dup name>int
               3 pick = IF nip dup THEN
         REPEAT
         drop nip
         dup 0<> ;
 
 : look ( cfa -- lfa flag )
-        dup forthstart <
-        IF PrimStart (look)
-        ELSE >name true THEN ;
+        dup dictionary-end forthstart within
+	IF
+	    PrimStart (look)
+	ELSE
+	    >name dup ??? <>
+	THEN ;