1 files changed, 2 insertions, 4 deletions

diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 0f93051ee69..5066514687d 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -980,10 +980,8 @@ See documentation of variable `tags-file-name'."
 
 (defun etags-file-of-tag ()
   (save-excursion
-    (search-backward "\f\n")
-    (forward-char 2)
-    (buffer-substring (point)
-                      (progn (skip-chars-forward "^,") (point)))))
+    (re-search-backward "\f\n\\([^\n]+\\),[0-9]*\n")
+    (buffer-substring (match-beginning 1) (match-end 1))))
 
 (defun etags-tags-completion-table ()
   (let ((table (make-vector 511 0)))