--- gforth/look.fs	1996/08/21 14:58:42	1.5
+++ 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@ alias-mask and
-\         UNTIL ;
-
 : PrimStart ['] true >name ;
 
 \ look                                                  17may93jaw
@@ -49,7 +42,10 @@ decimal
         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 ;