From 55a841ef116ce538fc4d14bb78beb0484be604be Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Thu, 5 Sep 2013 16:09:11 +1000
Subject: Bug [#1520]. Make SCI_GETSTYLEFROMSUBSTYLE work for secondary styles.

---
 lexers/LexCPP.cxx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lexers')

diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx
index 5340271d5..70af0343f 100644
--- a/lexers/LexCPP.cxx
+++ b/lexers/LexCPP.cxx
@@ -388,7 +388,9 @@ public:
 		return subStyles.Length(styleBase);
 	}
 	int SCI_METHOD StyleFromSubStyle(int subStyle) {
-		return subStyles.BaseStyle(subStyle);
+		int styleBase = subStyles.BaseStyle(MaskActive(subStyle));
+		int active = subStyle & activeFlag;
+		return styleBase | active;
 	}
 	void SCI_METHOD FreeSubStyles() {
 		subStyles.Free();
-- 
cgit v1.2.3