(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 7e63bb176b4b65e9569b65b4faa4fca335b8d20c..42c43ee1f010bf492c1fc69975e54f5ee128f4e3 100644 (file)
--- 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)))
 \f