--- gforth/wordinfo.fs	1998/05/15 21:24:39	1.16
+++ gforth/wordinfo.fs	2000/05/27 18:55:55	1.20
@@ -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
@@ -31,10 +31,11 @@
 \ the old alias? did not work and it is not used, so I changed
 \ it in many respects - anton
 : alias? ( nfa1 -- nfa2|0 )
-    \ if nfa1 is an alias, nfa2 is the name of the original word
+    \ if nfa1 is an alias, nfa2 is the name of the original word.
+    \ if the original word has no name, return 0.
     dup cell+ c@ alias-mask and 0=
     IF ( nfa1 )
-	((name>)) @ >name ( use look instead? )
+	((name>)) @ >name
     ELSE
 	drop 0
     THEN ;
@@ -63,7 +64,7 @@
 
 [IFDEF] forthstart
 : xtprim? ( xt -- flag )
-    dictionary-end forthstart within ; \ !! does not work for CODE words
+    in-dictionary? 0= ; \ !! does not work for CODE words
 [ELSE]
 : xtprim? ( xt -- flag )
     dup >body swap >code-address = ; \ !! works only for indirect threaded code