--- gforth/kernel/tools.fs	1999/03/29 22:52:35	1.11
+++ gforth/kernel/tools.fs	2001/01/24 10:32:02	1.17
@@ -1,6 +1,6 @@
 \ TOOLS.FS     Toolkit extentions                      2may93jaw
 
-\ Copyright (C) 1995,1998 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1998,1999 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,10 +16,14 @@
 
 \ You should have received a copy of the GNU General Public License
 \ along with this program; if not, write to the Free Software
-\ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 \ May be cross-compiled
 
+require ./io.fs		\ type ...
+require ./nio.fs	\ . <# ...
+require ./int.fs	\ wordlist-id ..
+
 hex
 
 \ .S            CORE / CORE EXT                         9may93jaw
@@ -75,13 +79,11 @@ Variable /dump
 
 \ words visible in roots                               14may93py
 
-include  ../termsize.fs
+include  ./../termsize.fs
 
-: words
-    \G ** this will not get annotated. See other defn in search.fs .. **
-    \G It does not work to use "wordset-" prefix since this file is glossed
-    \G by cross.fs which doesn't have the same functionalty as makedoc.fs
-    cr 0 context @ wordlist-id
+: wordlist-words ( wid -- ) \ gforth
+    \G Display the contents of the wordlist wid.
+    wordlist-id 0 swap cr
     BEGIN
 	@ dup
     WHILE
@@ -94,6 +96,11 @@ include  ../termsize.fs
     REPEAT
     2drop ;
 
+: words
+    \G ** this will not get annotated. See other defn in search.fs .. **
+    \G It does not work to use "wordset-" prefix since this file is glossed
+    \G by cross.fs which doesn't have the same functionalty as makedoc.fs
+    context @ wordlist-words ;
+
 ' words alias vlist ( -- ) \ gforth
 \g Old (pre-Forth-83) name for @code{WORDS}.
-