--- gforth/etags.fs	1995/11/29 20:20:34	1.4
+++ gforth/etags.fs	2012/03/09 20:34:46	1.20
@@ -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,10 +32,19 @@
 \ (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.
 
+\ 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
@@ -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 -- )
@@ -85,20 +87,15 @@ create emit-file-char 0 c,
     endif
     rdrop ;
 
-: put-tags-entry ( -- )
-    \ 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
+: put-tags-string ( c-addr u -- )
+    2>r source-id dup 0<> swap -1 <> and	\ input from a file
+    current @ locals-list <> and	\ not a local name
     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
+	r> 2r> rot dup >r write-file throw
 	1 r@ emit-file throw
 	base @ decimal sourceline# 0 <# #s #> r@ write-file throw base !
 	s" ,0" r@ write-line throw
@@ -106,7 +103,21 @@ create emit-file-char 0 c,
 	\ instead of using 0, we could use file-position and subtract
 	\ the line length
 	rdrop
-    endif cr ;
+    else
+	2r> 2drop
+    endif ;
+
+: put-tags-name ( -- )
+    >in @ parse-name put-tags-string >in ! ;
+
+' put-tags-name is record-name
+
+: put-tags-entry ( -- )
+    \ 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
+    latest 0<> if
+	latest name>string put-tags-string
+    then ;
 
 : (tags-header) ( -- )
     defers header