The problem with etags inclusion with more than one include directive
appears to be an off-by one.  This patch fixes it for me:

After the (goto-char (match-end)) the point is at the start of the
next control-L.  The forward-line then skips it and makes the pattern
match against tags-include-pattern fail.

---
 lisp/etags.el |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Index: xemacs21-21.4.21/lisp/etags.el
===================================================================
--- xemacs21-21.4.21.orig/lisp/etags.el 2010-02-09 09:41:07.000000000 +1100
+++ xemacs21-21.4.21/lisp/etags.el      2010-02-09 10:13:42.000000000 +1100
@@ -638,9 +638,8 @@
     ;; Skip over the include entries at the bottom of the file.
     (while (looking-at tags-include-pattern)
       (goto-char (match-end 0))
-      (setq filename (file-name-sans-versions (match-string 1)))
-      (forward-line 1))
-    (or (eobp) (error "Bad TAGS file")))
+      (setq filename (file-name-sans-versions (match-string 1))))
+    (or (eobp) (error "Bad TAGS file %s" buffer-file-name)))
   (message "Adding %s to tags completion table...done" buffer-file-name))
 
 


--
Dr Peter Chubb        www.nicta.com.au      peter DOT chubb AT nicta.com.au
http://www.ertos.nicta.com.au           ERTOS within National ICT Australia
From Imagination to Impact                       Imagining the (ICT) Future



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to