diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-02-17 15:00:38 +0000 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-02-17 15:00:38 +0000 |
| commit | cc73f4d7bc75a615e56abc75ba81e3a1e17a0788 (patch) | |
| tree | d9e976d6eba5a8aeae3536733c11aac385b9a056 /scintilla/lexers | |
| parent | 33208d94576b5e30326354074205af0775d5420a (diff) | |
| download | notepad2-mod-cc73f4d7bc75a615e56abc75ba81e3a1e17a0788.zip notepad2-mod-cc73f4d7bc75a615e56abc75ba81e3a1e17a0788.tar.gz notepad2-mod-cc73f4d7bc75a615e56abc75ba81e3a1e17a0788.tar.bz2 | |
update scintilla
git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@713 28bd50df-7adb-d945-0439-6e466c6a13cc
Diffstat (limited to 'scintilla/lexers')
| -rw-r--r-- | scintilla/lexers/LexHTML.cxx | 2 | ||||
| -rw-r--r-- | scintilla/lexers/LexNsis.cxx | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/scintilla/lexers/LexHTML.cxx b/scintilla/lexers/LexHTML.cxx index 5fe4746..abfa98f 100644 --- a/scintilla/lexers/LexHTML.cxx +++ b/scintilla/lexers/LexHTML.cxx @@ -903,7 +903,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty (chNext == '?') &&
!IsScriptCommentState(state)) {
beforeLanguage = scriptLanguage;
- scriptLanguage = segIsScriptingIndicator(styler, i + 2, i + 6, eScriptPHP);
+ scriptLanguage = segIsScriptingIndicator(styler, i + 2, i + 6, isXml ? eScriptXML : eScriptPHP);
if (scriptLanguage != eScriptPHP && isStringState(state)) continue;
styler.ColourTo(i - 1, StateToPrint);
beforePreProc = state;
diff --git a/scintilla/lexers/LexNsis.cxx b/scintilla/lexers/LexNsis.cxx index 35c5cdb..b448830 100644 --- a/scintilla/lexers/LexNsis.cxx +++ b/scintilla/lexers/LexNsis.cxx @@ -142,6 +142,7 @@ static int calculateFoldNsis(unsigned int start, unsigned int end, int foldlevel bIgnoreCase = true;
char s[20]; // The key word we are looking for has atmost 13 characters
+ s[0] = '\0';
for (unsigned int i = 0; i < end - start + 1 && i < 19; i++)
{
s[i] = static_cast<char>( styler[ start + i ] );
|