--- gforth/etags.fs	1995/09/06 21:00:14	1.2
+++ gforth/etags.fs	2007/12/31 18:40:24	1.17
@@ -1,5 +1,23 @@
 \ Etags support for GNU Forth.
 
+\ Copyright (C) 1995,1998,2001,2003,2007 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 3
+\ of the License, or (at your option) any later version.
+
+\ This program is distributed in the hope that it will be useful,
+\ but WITHOUT ANY WARRANTY; without even the implied warranty of
+\ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+\ 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, see http://www.gnu.org/licenses/.
+
+
 \ This does not work like etags; instead, the TAGS file is updated
 \ during the normal Forth interpretation/compilation process.
 
@@ -18,6 +36,15 @@
 \ 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 environ.fs
+require extend.fs
+
 : tags-file-name ( -- c-addr u )
     \ for now I use just TAGS; this may become more flexible in the
     \ future
@@ -45,21 +72,15 @@ 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 -- )
     >r
-    loadfilename 2@ last-loadfilename 2@ d<>
+    sourcefilename last-loadfilename 2@ d<>
     if
 	#ff r@ emit-file throw
 	#lf r@ emit-file throw
-	loadfilename 2@ 2dup
+	sourcefilename 2dup
 	r@ write-file throw
 	last-loadfilename 2!
 	s" ,0" r@ write-line throw
@@ -70,24 +91,24 @@ create emit-file-char 0 c,
     \ write the entry for the last name to the TAGS file
     \ 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
-    get-current locals-list <> and	\ not a local name
-    last @ 0<> and	\ not an anonymous (i.e. noname) header
+    current @ locals-list <> and	\ not a local name
+    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 loadline @ 0 <# #s #> r@ write-file throw base !
+	base @ decimal sourceline# 0 <# #s #> r@ write-file throw base !
 	s" ,0" r@ write-line throw
 	\ the character position in the file; not strictly necessary AFAIK
 	\ instead of using 0, we could use file-position and subtract
 	\ the line length
 	rdrop
-    endif cr ;
+    endif ;
 
 : (tags-header) ( -- )
     defers header