Update Scintilla to v3.6.1.

3 files changed, 48 insertions, 2 deletions

diff --git a/scintilla/include/SciLexer.h b/scintilla/include/SciLexer.h
index 233c507..adf45ec 100644
--- a/scintilla/include/SciLexer.h
+++ b/scintilla/include/SciLexer.h
@@ -499,6 +499,24 @@
 #define SCE_ERR_JAVA_STACK 20

 #define SCE_ERR_VALUE 21

 #define SCE_ERR_GCC_INCLUDED_FROM 22

+#define SCE_ERR_ESCSEQ 23

+#define SCE_ERR_ESCSEQ_UNKNOWN 24

+#define SCE_ERR_ES_BLACK 40

+#define SCE_ERR_ES_RED 41

+#define SCE_ERR_ES_GREEN 42

+#define SCE_ERR_ES_BROWN 43

+#define SCE_ERR_ES_BLUE 44

+#define SCE_ERR_ES_MAGENTA 45

+#define SCE_ERR_ES_CYAN 46

+#define SCE_ERR_ES_GRAY 47

+#define SCE_ERR_ES_DARK_GRAY 48

+#define SCE_ERR_ES_BRIGHT_RED 49

+#define SCE_ERR_ES_BRIGHT_GREEN 50

+#define SCE_ERR_ES_YELLOW 51

+#define SCE_ERR_ES_BRIGHT_BLUE 52

+#define SCE_ERR_ES_BRIGHT_MAGENTA 53

+#define SCE_ERR_ES_BRIGHT_CYAN 54

+#define SCE_ERR_ES_WHITE 55

 #define SCE_BAT_DEFAULT 0

 #define SCE_BAT_COMMENT 1

 #define SCE_BAT_WORD 2

@@ -1589,6 +1607,7 @@
 #define SCE_COFFEESCRIPT_COMMENTBLOCK 22

 #define SCE_COFFEESCRIPT_VERBOSE_REGEX 23

 #define SCE_COFFEESCRIPT_VERBOSE_REGEX_COMMENT 24

+#define SCE_COFFEESCRIPT_INSTANCEPROPERTY 25

 #define SCE_AVS_DEFAULT 0

 #define SCE_AVS_COMMENTBLOCK 1

 #define SCE_AVS_COMMENTBLOCKN 2

diff --git a/scintilla/include/Scintilla.h b/scintilla/include/Scintilla.h
index cc8dfa2..432c3bc 100644
--- a/scintilla/include/Scintilla.h
+++ b/scintilla/include/Scintilla.h
@@ -196,6 +196,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SC_CHARSET_MAC 77

 #define SC_CHARSET_OEM 255

 #define SC_CHARSET_RUSSIAN 204

+#define SC_CHARSET_OEM866 866

 #define SC_CHARSET_CYRILLIC 1251

 #define SC_CHARSET_SHIFTJIS 128

 #define SC_CHARSET_SYMBOL 2

diff --git a/scintilla/include/Scintilla.iface b/scintilla/include/Scintilla.iface
index 9b004e6..ec8d0bd 100644
--- a/scintilla/include/Scintilla.iface
+++ b/scintilla/include/Scintilla.iface
@@ -417,6 +417,7 @@ val SC_CHARSET_HANGUL=129
 val SC_CHARSET_MAC=77

 val SC_CHARSET_OEM=255

 val SC_CHARSET_RUSSIAN=204

+val SC_CHARSET_OEM866=866

 val SC_CHARSET_CYRILLIC=1251

 val SC_CHARSET_SHIFTJIS=128

 val SC_CHARSET_SYMBOL=2

@@ -2811,9 +2812,12 @@ val SCE_P_COMMENTBLOCK=12
 val SCE_P_STRINGEOL=13

 val SCE_P_WORD2=14

 val SCE_P_DECORATOR=15

-# Lexical states for SCLEX_CPP

+# Lexical states for SCLEX_CPP, SCLEX_BULLANT, SCLEX_COBOL, SCLEX_TACL, SCLEX_TAL

 lex Cpp=SCLEX_CPP SCE_C_

 lex BullAnt=SCLEX_BULLANT SCE_C_

+lex COBOL=SCLEX_COBOL SCE_C_

+lex TACL=SCLEX_TACL SCE_C_

+lex TAL=SCLEX_TAL SCE_C_

 val SCE_C_DEFAULT=0

 val SCE_C_COMMENT=1

 val SCE_C_COMMENTLINE=2

@@ -3100,10 +3104,13 @@ val SCE_RB_STDIN=30
 val SCE_RB_STDOUT=31

 val SCE_RB_STDERR=40

 val SCE_RB_UPPER_BOUND=41

-# Lexical states for SCLEX_VB, SCLEX_VBSCRIPT, SCLEX_POWERBASIC

+# Lexical states for SCLEX_VB, SCLEX_VBSCRIPT, SCLEX_POWERBASIC, SCLEX_BLITZBASIC, SCLEX_PUREBASIC, SCLEX_FREEBASIC

 lex VB=SCLEX_VB SCE_B_

 lex VBScript=SCLEX_VBSCRIPT SCE_B_

 lex PowerBasic=SCLEX_POWERBASIC SCE_B_

+lex BlitzBasic=SCLEX_BLITZBASIC SCE_B_

+lex PureBasic=SCLEX_PUREBASIC SCE_B_

+lex FreeBasic=SCLEX_FREEBASIC SCE_B_

 val SCE_B_DEFAULT=0

 val SCE_B_COMMENT=1

 val SCE_B_NUMBER=2

@@ -3198,6 +3205,24 @@ val SCE_ERR_TIDY=19
 val SCE_ERR_JAVA_STACK=20

 val SCE_ERR_VALUE=21

 val SCE_ERR_GCC_INCLUDED_FROM=22

+val SCE_ERR_ESCSEQ=23

+val SCE_ERR_ESCSEQ_UNKNOWN=24

+val SCE_ERR_ES_BLACK=40

+val SCE_ERR_ES_RED=41

+val SCE_ERR_ES_GREEN=42

+val SCE_ERR_ES_BROWN=43

+val SCE_ERR_ES_BLUE=44

+val SCE_ERR_ES_MAGENTA=45

+val SCE_ERR_ES_CYAN=46

+val SCE_ERR_ES_GRAY=47

+val SCE_ERR_ES_DARK_GRAY=48

+val SCE_ERR_ES_BRIGHT_RED=49

+val SCE_ERR_ES_BRIGHT_GREEN=50

+val SCE_ERR_ES_YELLOW=51

+val SCE_ERR_ES_BRIGHT_BLUE=52

+val SCE_ERR_ES_BRIGHT_MAGENTA=53

+val SCE_ERR_ES_BRIGHT_CYAN=54

+val SCE_ERR_ES_WHITE=55

 # Lexical states for SCLEX_BATCH

 lex Batch=SCLEX_BATCH SCE_BAT_

 val SCE_BAT_DEFAULT=0

@@ -4437,6 +4462,7 @@ val SCE_COFFEESCRIPT_TRIPLEVERBATIM=21
 val SCE_COFFEESCRIPT_COMMENTBLOCK=22

 val SCE_COFFEESCRIPT_VERBOSE_REGEX=23

 val SCE_COFFEESCRIPT_VERBOSE_REGEX_COMMENT=24

+val SCE_COFFEESCRIPT_INSTANCEPROPERTY=25

 # Lexical states for SCLEX_AVS

 lex AVS=SCLEX_AVS SCE_AVS_

 val SCE_AVS_DEFAULT=0