aboutsummaryrefslogtreecommitdiffhomepage
path: root/lexers/LexCPP.cxx
diff options
context:
space:
mode:
authorMarko Njezic <unknown>2012-02-28 23:49:42 +0100
committerMarko Njezic <unknown>2012-02-28 23:49:42 +0100
commit2e771e5e226d98f3b1a1677abc6d7298f39d8c3f (patch)
tree6e313beb72d5757e638f53ea2819683f64f23f7e /lexers/LexCPP.cxx
parent729d7cafe6af9e453e58e4689128077bea3d7706 (diff)
downloadscintilla-mirror-2e771e5e226d98f3b1a1677abc6d7298f39d8c3f.tar.gz
Bug #3495445. Properly mask restored state after processing keywords in document
comment that's inside disabled preprocessor macro.
Diffstat (limited to 'lexers/LexCPP.cxx')
-rw-r--r--lexers/LexCPP.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx
index b92f279d3..a2f323e31 100644
--- a/lexers/LexCPP.cxx
+++ b/lexers/LexCPP.cxx
@@ -676,7 +676,7 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle,
if (!IsASpace(sc.ch) || !keywords3.InList(s + 1)) {
sc.ChangeState(SCE_C_COMMENTDOCKEYWORDERROR|activitySet);
}
- sc.SetState(styleBeforeDCKeyword);
+ sc.SetState(styleBeforeDCKeyword|activitySet);
}
break;
case SCE_C_STRING: