diff options
| author | Marko Njezic <devnull@localhost> | 2012-02-28 23:49:42 +0100 | 
|---|---|---|
| committer | Marko Njezic <devnull@localhost> | 2012-02-28 23:49:42 +0100 | 
| commit | 0531b486d248748ea14ffcdf9c6d0283b8652f4f (patch) | |
| tree | 9a154f2f8814cc2a25926971e4447c6ed40f0f63 /lexers/LexCPP.cxx | |
| parent | 2aed63a5bc4eb0667d490b62343d1a40ed4dfadf (diff) | |
| download | scintilla-mirror-0531b486d248748ea14ffcdf9c6d0283b8652f4f.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.cxx | 2 | 
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: | 
