Merge pull request #1042 from Gama11/FixAdditionalKeywords

Scintilla update: use the same keyword IDs for additional keywords

Author: elsassph

External/3rdParty/Scintilla/additional_keywords.patch

@@ -34,22 +34,22 @@ diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx
  	WordList ppDefinitions;
  	WordList markerList;
  	struct SymbolValue {
-@@ -589,6 +595,15 @@
- 	case 5:
- 		wordListN = &markerList;
+@@ -587,6 +593,15 @@
+ 		wordListN = &ppDefinitions;
  		break;
-+	case 6:
+ 	case 5:
 +		wordListN = &keywords5;
 +		break;
-+	case 7:
++	case 6:
 +		wordListN = &keywords6;
 +		break;
-+	case 8:
++	case 7:
 +		wordListN = &keywords7;
 +		break;
++	case 8:
+ 		wordListN = &markerList;
+ 		break;
  	}
- 	Sci_Position firstModification = -1;
- 	if (wordListN) {
 @@ -809,6 +824,12 @@
  						sc.ChangeState(SCE_C_WORD2|activitySet);
  					} else if (keywords4.InList(s)) {

FlashDevelop/Bin/Debug/SciLexer.dll

@@ -39,9 +39,9 @@
 				<keyword key="1" class="haxe-additional-keywords" />
 				<keyword key="2" class="haxe-documentation-keywords" />
 				<keyword key="3" class="haxe-primary-keywords" />
-				<keyword key="6" class="haxe-additional-keywords3" />
-				<keyword key="7" class="haxe-additional-keywords4" />
-				<keyword key="8" class="haxe-additional-keywords5" />
+				<keyword key="5" class="haxe-additional-keywords3" />
+				<keyword key="6" class="haxe-additional-keywords4" />
+				<keyword key="7" class="haxe-additional-keywords5" />
 			</use-keywords>
 			<!-- COLORING_START -->
 			<editor-style caret-fore="0x000000" caretline-back="0xececec" selection-fore="0xffffff" selection-back="0x3399ff" colorize-marker-back="true" margin-fore="0xffffff" margin-back="0xffffff" marker-back="0xbcbcbc" />