aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authornyamatongwe <devnull@localhost>2001-08-29 23:59:08 +0000
committernyamatongwe <devnull@localhost>2001-08-29 23:59:08 +0000
commit4e4ad6385277cb67dd5a89425b981cc7c7959524 (patch)
tree859ff81d3a040a3c3695eac122c388612d5cb1b2 /src
parent7e84487b028f8c831d337d7a84ccb93b01bce4a6 (diff)
downloadscintilla-mirror-4e4ad6385277cb67dd5a89425b981cc7c7959524.tar.gz
Changed ASP default language option to asp.default.language which can
be 1 for JavaScript, 2 for VBScript, or 3 for Python with JavaScript as the default.
Diffstat (limited to 'src')
-rw-r--r--src/LexHTML.cxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/LexHTML.cxx b/src/LexHTML.cxx
index d7d94856a..aef65beca 100644
--- a/src/LexHTML.cxx
+++ b/src/LexHTML.cxx
@@ -380,11 +380,9 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
if (lineCurrent > 0) {
lineState = styler.GetLineState(lineCurrent);
} else {
- lineState = eScriptJS << 8; // Default client script is JavaScript
- if (styler.GetPropertyInt("asp.default.to.vbs"))
- lineState |= eScriptVBS << 4;
- else // Default ASP script to JavaScript for compatibbility with old versions
- lineState |= eScriptJS << 4;
+ // Default client and ASP scripting language is JavaScript
+ lineState = eScriptJS << 8;
+ lineState |= styler.GetPropertyInt("asp.default.language", eScriptJS) << 4;
}
int inScriptType = (lineState >> 0) & 0x03; // 2 bits of scripting type
bool tagOpened = (lineState >> 2) & 0x01; // 1 bit to know if we are in an opened tag