--- gforth/etags.fs	2008/11/15 14:24:55	1.18
+++ gforth/etags.fs	2012/12/31 15:25:18	1.21
@@ -1,6 +1,6 @@
 \ Etags support for GNU Forth.
 
-\ Copyright (C) 1995,1998,2001,2003,2007 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1998,2001,2003,2007,2008,2012 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -87,20 +87,15 @@ create tags-line 128 chars allot
     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
+: 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
-    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
-	latest 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
@@ -108,8 +103,22 @@ create tags-line 128 chars allot
 	\ instead of using 0, we could use file-position and subtract
 	\ the line length
 	rdrop
+    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
     put-tags-entry ;