Thanks, Andre.

[lyx.git] / src / LaTeX.cpp

diff --git a/src/LaTeX.cpp b/src/LaTeX.cpp
index 658c5f5519ae3e249ae636b8c1415a26af0db544..49968ffdc8a6884995b4f53ff166c66fe09b7b05 100644 (file)
--- a/src/LaTeX.cpp
+++ b/src/LaTeX.cpp
@@ -671,7 +671,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.
 
@@ -1025,7 +1027,7 @@ void LaTeX::deplog(DepTable & head)
                // where "File: file.ext" would be skipped
                if (regex_match(token, sub, reg6)) {
                        // search for strings in (...)
-                       static regex reg6_1("\\(([^()]+)(.).*");
+                       static regex reg6_1("\\(([^()]+)(.)");
                        smatch what;
                        string::const_iterator first = token.begin();
                        string::const_iterator end = token.end();