diff options
| -rw-r--r-- | Readme-mod.txt | 2 | ||||
| -rw-r--r-- | scintilla/lexers/LexAsm.cxx | 6 | ||||
| -rw-r--r-- | scintilla/lexers/LexModula.cxx | 3 |
3 files changed, 3 insertions, 8 deletions
diff --git a/Readme-mod.txt b/Readme-mod.txt index 52f9745..95b6c57 100644 --- a/Readme-mod.txt +++ b/Readme-mod.txt @@ -16,6 +16,6 @@ More information: * Kai Liu's website: http://code.kliu.org/misc/notepad2/
* Bookmark Edition website: http://www.rlvision.com/notepad2/about.asp
-Notepad2-mod 4.2.25 has been created with Scintilla 2.24. The unused lexers
+Notepad2-mod 4.2.25 has been created with Scintilla 2.25. The unused lexers
are commented out in "scintilla/src/Catalogue.cxx". You can use WDK 7.1, or MSVC 2010,
or Intel Parallel Composer 2011 to build Notepad2-mod.
diff --git a/scintilla/lexers/LexAsm.cxx b/scintilla/lexers/LexAsm.cxx index e6f3c17..c28a8e9 100644 --- a/scintilla/lexers/LexAsm.cxx +++ b/scintilla/lexers/LexAsm.cxx @@ -382,7 +382,6 @@ void SCI_METHOD LexerAsm::Fold(unsigned int startPos, int length, int initStyle, int levelCurrent = SC_FOLDLEVELBASE;
if (lineCurrent > 0)
levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
- int levelMinCurrent = levelCurrent;
int levelNext = levelCurrent;
char chNext = styler[startPos];
int styleNext = styler.StyleAt(startPos);
@@ -424,7 +423,7 @@ void SCI_METHOD LexerAsm::Fold(unsigned int startPos, int length, int initStyle, }
if (options.foldSyntaxBased && (style == SCE_ASM_DIRECTIVE)) {
word[wordlen++] = static_cast<char>(LowerCase(ch));
- if (wordlen == 100) { // prevent overflow
+ if (wordlen == 100) { // prevent overflow
word[0] = '\0';
wordlen = 1;
}
@@ -435,7 +434,7 @@ void SCI_METHOD LexerAsm::Fold(unsigned int startPos, int length, int initStyle, levelNext++;
} else if (directives4foldend.InList(word)){
levelNext--;
- }
+ }
}
}
if (!IsASpace(ch))
@@ -452,7 +451,6 @@ void SCI_METHOD LexerAsm::Fold(unsigned int startPos, int length, int initStyle, }
lineCurrent++;
levelCurrent = levelNext;
- levelMinCurrent = levelCurrent;
if (atEOL && (i == static_cast<unsigned int>(styler.Length()-1))) {
// There is an empty line at end of file so give it same level and empty
styler.SetLevel(lineCurrent, (levelCurrent | levelCurrent << 16) | SC_FOLDLEVELWHITEFLAG);
diff --git a/scintilla/lexers/LexModula.cxx b/scintilla/lexers/LexModula.cxx index eccfd0e..1944f2b 100644 --- a/scintilla/lexers/LexModula.cxx +++ b/scintilla/lexers/LexModula.cxx @@ -254,20 +254,17 @@ static void FoldModulaDoc( unsigned int startPos, int clv_old = curLevel;
int pos;
char ch;
- bool found;
int clv_new;
while( cln > 0 ) {
clv_new = styler.LevelAt( cln - 1 ) >> 16;
if( clv_new < clv_old ) {
nextLevel--;
pos = styler.LineStart( cln );
- found = false;
while( ( ch = styler.SafeGetCharAt( pos ) ) != '\n' ) {
if( ch == 'P' ) {
if( styler.StyleAt(pos) == SCE_MODULA_KEYWORD ) {
if( checkKeyIdentOper( styler, pos, endPos,
"PROCEDURE", '(' ) ) {
- found = true;
break;
}
}
|