--- gforth/etags.fs	1995/12/23 16:21:56	1.5
+++ gforth/etags.fs	2003/08/25 14:17:44	1.14
@@ -1,6 +1,6 @@
 \ Etags support for GNU Forth.
 
-\ Copyright (C) 1995 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1998,2001,2003 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,7 +16,7 @@
 
 \ 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.
 
 
 \ This does not work like etags; instead, the TAGS file is updated
@@ -37,6 +37,14 @@
 \ header, NAME>STRING must convert that pointer to a string, and
 \ HEADER must be a deferred word that is called to create the name.
 
+\ 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 extend.fs
+
 : tags-file-name ( -- c-addr u )
     \ for now I use just TAGS; this may become more flexible in the
     \ future
@@ -64,12 +72,6 @@ create tags-line 128 chars allot
     endif
     tags-file @ ;
 
-create emit-file-char 0 c,
-
-: emit-file ( c file-id -- )
-    swap emit-file-char c!
-    emit-file-char 1 chars rot write-file ;
-
 2variable last-loadfilename 0 0 last-loadfilename 2!
 
 : put-load-file-name ( file-id -- )
@@ -90,15 +92,15 @@ create emit-file-char 0 c,
     \ 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