From 610c25c1bf15b2c6b4acb662c80b35a59e666c68 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 18 Oct 1994 02:19:25 +0000 Subject: [PATCH] (etags-tags-table-files, etags-tags-included-tables): Search backwards for the comma in case the file name contains one. --- lisp/progmodes/etags.el | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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))) -- 2.39.5