Revision: 3859 http://geany.svn.sourceforge.net/geany/?rev=3859&view=rev Author: ntrel Date: 2009-06-11 14:25:20 +0000 (Thu, 11 Jun 2009)
Log Message: ----------- Backport fix from Scintilla CVS: Pascal lexer hanging on file that starts with 'interface' after whitespace.
Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/LexPascal.cxx
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-06-11 09:48:09 UTC (rev 3858) +++ trunk/ChangeLog 2009-06-11 14:25:20 UTC (rev 3859) @@ -1,3 +1,11 @@ +2009-06-11 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * scintilla/LexPascal.cxx: + Backport fix from Scintilla CVS: + Pascal lexer hanging on file that starts with 'interface' after + whitespace. + + 2009-06-11 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* waf:
Modified: trunk/scintilla/LexPascal.cxx =================================================================== --- trunk/scintilla/LexPascal.cxx 2009-06-11 09:48:09 UTC (rev 3858) +++ trunk/scintilla/LexPascal.cxx 2009-06-11 14:25:20 UTC (rev 3859) @@ -414,7 +414,7 @@ }
static void ClassifyPascalWordFoldPoint(int &levelCurrent, int &lineFoldStateCurrent, - unsigned int startPos, unsigned int endPos, + int startPos, unsigned int endPos, unsigned int lastStart, unsigned int currentPos, Accessor &styler) { char s[100]; GetRangeLowered(lastStart, currentPos, styler, s, sizeof(s)); @@ -471,7 +471,7 @@ } else if (strcmp(s, "interface") == 0) { // "interface" keyword requires special handling... bool ignoreKeyword = true; - unsigned int j = lastStart - 1; + int j = lastStart - 1; char ch = styler.SafeGetCharAt(j); while ((j >= startPos) && (IsASpaceOrTab(ch) || ch == '\r' || ch == '\n' || IsStreamCommentStyle(styler.StyleAt(j)))) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.