diff options
| -rw-r--r-- | include/SciLexer.h | 4 | ||||
| -rw-r--r-- | include/Scintilla.iface | 5 | ||||
| -rw-r--r-- | src/LexHTML.cxx | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/include/SciLexer.h b/include/SciLexer.h index b6e41299d..68f7cbec5 100644 --- a/include/SciLexer.h +++ b/include/SciLexer.h @@ -43,8 +43,6 @@ #define SCLEX_NNCRONTAB 26 #define SCLEX_BULLANT 27 #define SCLEX_VBSCRIPT 28 -#define SCLEX_ASP 29 -#define SCLEX_PHP 30 #define SCLEX_BAAN 31 #define SCLEX_MATLAB 32 #define SCLEX_SCRIPTOL 33 @@ -813,6 +811,8 @@ #define SCE_CAML_COMMENT1 11 #define SCE_CAML_COMMENT2 12 #define SCE_CAML_COMMENT3 13 +#define SCLEX_ASP 29 +#define SCLEX_PHP 30 //--Autogenerated -- end of section automatically generated from Scintilla.iface #endif diff --git a/include/Scintilla.iface b/include/Scintilla.iface index 357de4623..bf4af856f 100644 --- a/include/Scintilla.iface +++ b/include/Scintilla.iface @@ -1716,8 +1716,6 @@ val SCLEX_TCL=25 val SCLEX_NNCRONTAB=26 val SCLEX_BULLANT=27 val SCLEX_VBSCRIPT=28 -val SCLEX_ASP=29 -val SCLEX_PHP=30 val SCLEX_BAAN=31 val SCLEX_MATLAB=32 val SCLEX_SCRIPTOL=33 @@ -2648,3 +2646,6 @@ val CARET_XJUMPS=0x10 val SCN_CHECKBRACE=2007 evt void PosChanged=2012(int position) +# SCLEX_HTML should be used in preference to these. +val SCLEX_ASP=29 +val SCLEX_PHP=30 diff --git a/src/LexHTML.cxx b/src/LexHTML.cxx index e1406234c..a579098f2 100644 --- a/src/LexHTML.cxx +++ b/src/LexHTML.cxx @@ -1974,5 +1974,6 @@ static const char * const htmlWordListDesc[] = { LexerModule lmHTML(SCLEX_HTML, ColouriseHyperTextDoc, "hypertext", 0, htmlWordListDesc); LexerModule lmXML(SCLEX_XML, ColouriseHyperTextDoc, "xml", 0, htmlWordListDesc); +// SCLEX_ASP and SCLEX_PHP should not be used in new code: use SCLEX_HTML instead. LexerModule lmASP(SCLEX_ASP, ColouriseASPDoc, "asp", 0, htmlWordListDesc); LexerModule lmPHP(SCLEX_PHP, ColourisePHPDoc, "php", 0, htmlWordListDesc); |