From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 18 Oct 1994 02:19:25 +0000 (+0000)
Subject: (etags-tags-table-files, etags-tags-included-tables):
X-Git-Tag: emacs-19.34~6275
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=610c25c1bf15b2c6b4acb662c80b35a59e666c68;p=emacs.git

(etags-tags-table-files, etags-tags-included-tables):
Search backwards for the comma in case the file name contains one.
---

diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 7e63bb176b4..42c43ee1f01 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1114,10 +1114,11 @@ See documentation of variable `tags-file-name'."
     (goto-char (point-min))
     (while (search-forward "\f\n" nil t)
       (setq beg (point))
-      (skip-chars-forward "^,\n")
-      (or (looking-at ",include$")
+      (end-of-line)
+      (skip-chars-backward "^," beg)
+      (or (looking-at "include$")
 	  ;; Expand in the default-directory of the tags table buffer.
-	  (setq files (cons (expand-file-name (buffer-substring beg (point)))
+	  (setq files (cons (expand-file-name (buffer-substring beg (1- (point))))
 			    files))))
     (nreverse files)))
 
@@ -1127,10 +1128,11 @@ See documentation of variable `tags-file-name'."
     (goto-char (point-min))
     (while (search-forward "\f\n" nil t)
       (setq beg (point))
-      (skip-chars-forward "^,\n")
-      (if (looking-at ",include$")
+      (end-of-line)
+      (skip-chars-backward "^," beg)
+      (if (looking-at "include$")
 	  ;; Expand in the default-directory of the tags table buffer.
-	  (setq files (cons (expand-file-name (buffer-substring beg (point)))
+	  (setq files (cons (expand-file-name (buffer-substring beg (1- (point))))
 			    files))))
     (nreverse files)))