--- gforth/etags.fs	1997/02/08 22:58:10	1.7
+++ gforth/etags.fs	2008/12/31 15:29:14	1.19
@@ -1,12 +1,12 @@
 \ Etags support for GNU Forth.
 
-\ Copyright (C) 1995 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1998,2001,2003,2007,2008 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
 \ GNU General Public License for more details.
 
 \ 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.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
 
 \ This does not work like etags; instead, the TAGS file is updated
@@ -33,11 +32,18 @@
 \ (e.g. via shared memory)
 
 \ This is ANS Forth with the following serious environmental
-\ dependences: the variable LAST must contain a pointer to the last
+\ dependences: the word LATEST must return a pointer to the last
 \ header, NAME>STRING must convert that pointer to a string, and
 \ HEADER must be a deferred word that is called to create the name.
 
-include extend.fs
+\ Changes by David: Removed the blanks before and after the explicit
+\ tag name, since that conflicts with Emacs' auto-completition. In
+\ fact those blanks are not necessary, since search is performed on
+\ the tag-text, rather than the tag name.
+
+require search.fs
+require environ.fs
+require extend.fs
 
 : tags-file-name ( -- c-addr u )
     \ for now I use just TAGS; this may become more flexible in the
@@ -86,15 +92,15 @@ 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
-	bl r@ emit-file throw
+\	bl r@ emit-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 !
 	s" ,0" r@ write-line throw