aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--doc/ScintillaHistory.html1
-rw-r--r--lexers/LexCPP.cxx2
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 2f70d81a3..c7ef3e593 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -387,6 +387,7 @@
<td>Chris Angelico</td>
</tr><tr>
<td>Marat Dukhan</td>
+ <td>Stefan Weil</td>
</tr>
</table>
<p>
diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx
index 1ad3a7081..1b56519c2 100644
--- a/lexers/LexCPP.cxx
+++ b/lexers/LexCPP.cxx
@@ -1050,7 +1050,7 @@ void LexerCPP::EvaluateTokens(std::vector<std::string> &tokens) {
if (tokens[i+2] == ")") {
// defined()
tokens.erase(tokens.begin() + i + 1, tokens.begin() + i + 3);
- } else if (((i+2)<tokens.size()) && (tokens[i+3] == ")")) {
+ } else if (((i+3)<tokens.size()) && (tokens[i+3] == ")")) {
// defined(<int>)
tokens.erase(tokens.begin() + i + 1, tokens.begin() + i + 4);
val = "1";