2 files changed, 12 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 596d972932b..c2b1e6be276 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+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
+        TeX `--file-line-error' format.
+
 2007-09-17  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * xt-mouse.el: Delete add-hook calls that were moved to
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 986c4fca20b..85cb77b69cc 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -2037,7 +2037,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