--- gforth/wordinfo.fs	1996/08/21 14:58:45	1.12
+++ gforth/wordinfo.fs	1997/07/06 14:29:34	1.14
@@ -22,7 +22,7 @@
 \ If you want check values then exclude comments,
 \ but keep in mind that this can't be cross-compiled
 
-INCLUDE look.fs
+\ INCLUDE look.fs
 
 \ Wordinfo is a tool that checks a nfa
 \ and finds out what wordtype we have
@@ -49,9 +49,8 @@ INCLUDE look.fs
     ((name>)) >code-address douser: = ;
 
 : does? ( nfa -- flag )
-    \ !! does not work on all installations
     ((name>))
-    >code-address ['] spaces >code-address = ;
+    >does-code 0<> ;
 
 : defered? ( nfa -- flag )
     ((name>)) >code-address dodefer: = ;
@@ -62,9 +61,15 @@ INCLUDE look.fs
 \ the above words could be factored with create-does>, but this would
 \ probably make this file incompatible with cross.
 
+[IFDEF] forthstart
+: xtprim? ( xt -- flag )
+	forthstart u< ;
+[ELSE]
+: xtprim? ( xt -- flag )
+	dup >body swap >code-address = ;		
+[THEN]
 : prim? ( nfa -- flag )
-        name>int
-        forthstart u< ;
+        name>int xtprim? ;
 
 \ None nestable IDs: