aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--doc/ScintillaHistory.html3
-rw-r--r--lexers/LexErrorList.cxx4
2 files changed, 7 insertions, 0 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index a646f05cd..b4fd684c9 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -533,6 +533,9 @@
<a href="http://sourceforge.net/p/scintilla/feature-requests/210/">Bug #210</a>.
</li>
<li>
+ The errorlist lexer detects warnings from Visual C++ which do not contain line numbers.
+ </li>
+ <li>
The HTML lexer no longer treats "&lt;?" inside a string in a script as potentially starting an XML document.
<a href="http://sourceforge.net/p/scintilla/bugs/767/">Bug #767</a>.
</li>
diff --git a/lexers/LexErrorList.cxx b/lexers/LexErrorList.cxx
index d6fe5ee77..142b7b5a5 100644
--- a/lexers/LexErrorList.cxx
+++ b/lexers/LexErrorList.cxx
@@ -257,6 +257,10 @@ static int RecogniseErrorListLine(const char *lineBuffer, Sci_PositionU lengthLi
return SCE_ERR_MS;
} else if ((state == stCtagsStringDollar) || (state == stCtags)) {
return SCE_ERR_CTAG;
+ } else if (initialColonPart && strstr(lineBuffer, ": warning C")) {
+ // Microsoft warning without line number
+ // <filename>: warning C9999
+ return SCE_ERR_MS;
} else {
return SCE_ERR_DEFAULT;
}