diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 14ccb0b2855..ce68071ddda 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-17  Glenn Morris  <rgm@gnu.org>
+
+	* textmodes/tex-mode.el (tex-compilation-parse-errors): Prefer the
+	filename from `--file-line-error', if it is available.
+
 2007-09-17  Joe Wells  <jbw@macs.hw.ac.uk>  (tiny change)
 
 	* textmodes/tex-mode.el (tex-compilation-parse-errors): Also match
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index c4380c59d9b..73075ce0598 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -2016,7 +2016,8 @@ for the error messages."
     (goto-char compilation-parsing-end)
     ;; Parse messages.
     (while (and (not (or found-desired (eobp)))
-		(prog1 (re-search-forward "^! " nil 'move)
+		(prog1 (re-search-forward
+			"^\\(?:[^:\n]+:[[:digit:]]+:\\|!\\) " nil 'move)
 		  (setq begin-of-error (match-beginning 0)
 			end-of-error (match-end 0)))
 		(re-search-forward