From 7c4f9dc43b291fc851d514ebbde836b18266c31d Mon Sep 17 00:00:00 2001
From: Enrico Forestieri <forenr@lyx.org>
Date: Sun, 4 Oct 2009 16:11:57 +0000
Subject: [PATCH] Fix bug #6258: LyX incorrectly interprets tetex warnings as
 errors.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@31517 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/LaTeX.cpp | 4 +++-
 status.16x    | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/LaTeX.cpp b/src/LaTeX.cpp
index c16ae1d9c7..f95c03acc4 100644
--- a/src/LaTeX.cpp
+++ b/src/LaTeX.cpp
@@ -659,7 +659,9 @@ int LaTeX::scanLogFile(TeXErrors & terr)
 				retval |= RERUN;
 			}
 		} else if (prefixIs(token, "! ") ||
-			   fle_style && regex_match(token, sub, file_line_error)) {
+			   (fle_style &&
+			    regex_match(token, sub, file_line_error) &&
+			    !contains(token, "pdfTeX warning"))) {
 			   // Ok, we have something that looks like a TeX Error
 			   // but what do we really have.
 
diff --git a/status.16x b/status.16x
index a1f7380556..3c5daccbe2 100644
--- a/status.16x
+++ b/status.16x
@@ -113,6 +113,9 @@ What's new
   elsarticle and adapted the elsarticle.lyx template file accordingly
   (bug 6189).
 
+- Correctly distinguish warnings from errors when using teTeX with
+  file:line:error style (bug 6258).
+
 
 * USER INTERFACE