aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--include/SciLexer.h1
-rw-r--r--include/Scintilla.iface1
-rw-r--r--src/LexOthers.cxx8
3 files changed, 9 insertions, 1 deletions
diff --git a/include/SciLexer.h b/include/SciLexer.h
index c43a54134..e3c689404 100644
--- a/include/SciLexer.h
+++ b/include/SciLexer.h
@@ -226,6 +226,7 @@
#define SCE_ERR_BORLAND 5
#define SCE_ERR_PERL 6
#define SCE_ERR_NET 7
+#define SCE_ERR_LUA 8
#define SCE_ERR_DIFF_CHANGED 10
#define SCE_ERR_DIFF_ADDITION 11
#define SCE_ERR_DIFF_DELETION 12
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index a8b42dbdb..c1d75623d 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -1465,6 +1465,7 @@ val SCE_ERR_CMD=4
val SCE_ERR_BORLAND=5
val SCE_ERR_PERL=6
val SCE_ERR_NET=7
+val SCE_ERR_LUA=8
val SCE_ERR_DIFF_CHANGED=10
val SCE_ERR_DIFF_ADDITION=11
val SCE_ERR_DIFF_DELETION=12
diff --git a/src/LexOthers.cxx b/src/LexOthers.cxx
index 492661c62..0814d518c 100644
--- a/src/LexOthers.cxx
+++ b/src/LexOthers.cxx
@@ -44,7 +44,7 @@ static void ColouriseBatchLine(
if (lineBuffer[i] == ':') {
// Label
if (lineBuffer[i + 1] == ':') {
- // :: is a fake label, similar to REM, see http://www.winmag.com/columns/explorer/2000/21.htm
+ // :: is a fake label, similar to REM, see http://content.techweb.com/winmag/columns/explorer/2000/21.htm
styler.ColourTo(endPos, SCE_BAT_COMMENT);
} else { // Real label
styler.ColourTo(endPos, SCE_BAT_LABEL);
@@ -346,6 +346,12 @@ static void ColouriseErrorListLine(
} else if (0 == strncmp(lineBuffer, "Warning ", strlen("Warning "))) {
// Borland warning message
styler.ColourTo(endPos, SCE_ERR_BORLAND);
+ } else if (strstr(lineBuffer, "at line " ) &&
+ strstr(lineBuffer, "at line " ) < lineBuffer + lengthLine &&
+ strstr(lineBuffer, "file ") &&
+ strstr(lineBuffer, "file ") < lineBuffer + lengthLine) {
+ // Lua error message
+ styler.ColourTo(endPos, SCE_ERR_LUA);
} else if (strstr(lineBuffer, " at " ) &&
strstr(lineBuffer, " at " ) < lineBuffer + lengthLine &&
strstr(lineBuffer, " line ") &&