--- gforth/wordinfo.fs	1997/07/06 14:29:34	1.14
+++ gforth/wordinfo.fs	2000/05/27 09:41:28	1.19
@@ -1,6 +1,6 @@
 \ WORDINFO.FS  V1.0                                    17may93jaw
 
-\ Copyright (C) 1995 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1998 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -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
+require look.fs
 
 \ Wordinfo is a tool that checks a nfa
 \ and finds out what wordtype we have
@@ -63,10 +63,11 @@
 
 [IFDEF] forthstart
 : xtprim? ( xt -- flag )
-	forthstart u< ;
+    in-dictionary? 0= ; \ !! does not work for CODE words
 [ELSE]
 : xtprim? ( xt -- flag )
-	dup >body swap >code-address = ;		
+    dup >body swap >code-address = ; \ !! works only for indirect threaded code
+				     \ !! does not work for primitives
 [THEN]
 : prim? ( nfa -- flag )
         name>int xtprim? ;