From 2e771e5e226d98f3b1a1677abc6d7298f39d8c3f Mon Sep 17 00:00:00 2001
From: Marko Njezic <unknown>
Date: Tue, 28 Feb 2012 23:49:42 +0100
Subject: Bug #3495445. Properly mask restored state after processing keywords
 in document comment that's inside disabled preprocessor macro.

---
 lexers/LexCPP.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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:
-- 
cgit v1.2.3