From 10463d5089e7e375501efc8349e55d25a5f00f46 Mon Sep 17 00:00:00 2001
From: Marko Njezic <unknown>
Date: Fri, 8 Jun 2012 01:09:13 +0200
Subject: Bug #3533036. Properly mask state when determining previous non
 whitespace character and counting visible characters in line.

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

(limited to 'lexers')

diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx
index 7d0990fd1..51752db85 100644
--- a/lexers/LexCPP.cxx
+++ b/lexers/LexCPP.cxx
@@ -918,7 +918,7 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle,
 			}
 		}
 
-		if (!IsASpace(sc.ch) && !IsSpaceEquiv(sc.state)) {
+		if (!IsASpace(sc.ch) && !IsSpaceEquiv(MaskActive(sc.state))) {
 			chPrevNonWhite = sc.ch;
 			visibleChars++;
 		}
-- 
cgit v1.2.3