--- gforth/etags.fs	2003/03/09 15:16:48	1.12
+++ gforth/etags.fs	2007/12/31 17:34:58	1.16
@@ -1,6 +1,6 @@
 \ Etags support for GNU Forth.
 
-\ Copyright (C) 1995,1998,2001 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1998,2001,2003,2007 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -43,6 +43,7 @@
 \ the tag-text, rather than the tag name.
 
 require search.fs
+require environ.fs
 require extend.fs
 
 : tags-file-name ( -- c-addr u )
@@ -92,14 +93,14 @@ create tags-line 128 chars allot
     \ if the input is from a file and it is not a local name
     source-id dup 0<> swap -1 <> and	\ input from a file
     current @ locals-list <> and	\ not a local name
-    last @ 0<> and	\ not an anonymous (i.e. noname) header
+    latest 0<> and	\ not an anonymous (i.e. noname) header
     if
 	tags-file-id >r 
 	r@ put-load-file-name
 	source drop >in @ r@ write-file throw
 	127 r@ emit-file throw
 \	bl r@ emit-file throw
-	last @ name>string r@ write-file throw
+	latest name>string r@ write-file throw
 \	bl r@ emit-file throw
 	1 r@ emit-file throw
 	base @ decimal sourceline# 0 <# #s #> r@ write-file throw base !