Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Thu, 22 May 2014 01:34:09 UTC Commit: 46affaf19eab08712174faac8638d4428c9e6516 https://github.com/geany/geany/commit/46affaf19eab08712174faac8638d4428c9e65...
Log Message: ----------- Update Scintilla to 3.4.2 final release
No code changes.
Modified Paths: -------------- scintilla/lexers/LexCPP.cxx scintilla/lexers/LexFortran.cxx scintilla/lexers/LexPerl.cxx scintilla/lexers/LexRuby.cxx scintilla/src/AutoComplete.h scintilla/src/Editor.cxx scintilla/src/RESearch.cxx
Modified: scintilla/lexers/LexCPP.cxx 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -723,13 +723,13 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle, // Inside inactive preprocessor declaration, state will be reset anyway at the end of this block. if ((sc.state == SCE_C_STRING) || (sc.state == SCE_C_CHARACTER)) { // Prevent SCE_C_STRINGEOL from leaking back to previous line which - // ends with a line continuation by locking in the state upto this position. + // ends with a line continuation by locking in the state up to this position. sc.SetState(sc.state); } if ((MaskActive(sc.state) == SCE_C_PREPROCESSOR) && (!continuationLine)) { sc.SetState(SCE_C_DEFAULT|activitySet); } - // Reset states to begining of colourise so no surprises + // Reset states to beginning of colourise so no surprises // if different sets of lines lexed. visibleChars = 0; lastWordWasUUID = false;
Modified: scintilla/lexers/LexFortran.cxx 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,7 @@ // Scintilla source code edit control /** @file LexFortran.cxx ** Lexer for Fortran. - ** Writen by Chuan-jian Shen, Last changed Sep. 2003 + ** Written by Chuan-jian Shen, Last changed Sep. 2003 **/ // Copyright 1998-2001 by Neil Hodgson neilh@scintilla.org // The License.txt file describes the conditions under which this software may be distributed.
Modified: scintilla/lexers/LexPerl.cxx 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -662,7 +662,7 @@ void SCI_METHOD LexerPerl::Lex(unsigned int startPos, int length, int initStyle, } else if (initStyle == SCE_PL_POD || initStyle == SCE_PL_POD_VERB ) { - // POD backtracking finds preceeding blank lines and goes back past them + // POD backtracking finds preceding blank lines and goes back past them int ln = styler.GetLine(startPos); if (ln > 0) { initStyle = styler.StyleAt(styler.LineStart(--ln)); @@ -1159,12 +1159,12 @@ void SCI_METHOD LexerPerl::Lex(unsigned int startPos, int length, int initStyle, sc.ForwardSetState(SCE_PL_DEFAULT); HereDoc.State = 3; } else { - // invalid indentifier; inexact fallback, but hey + // invalid identifier; inexact fallback, but hey sc.ChangeState(SCE_PL_IDENTIFIER); sc.SetState(SCE_PL_DEFAULT); } } else { - sc.ChangeState(SCE_PL_DEFAULT); // invalid indentifier + sc.ChangeState(SCE_PL_DEFAULT); // invalid identifier } backFlag = BACK_NONE; break;
Modified: scintilla/lexers/LexRuby.cxx 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -731,7 +731,7 @@ static void ColouriseRbDoc(unsigned int startPos, int length, int initStyle,
// If anyone runs into this problem, I recommend raising this // value slightly higher to replacing the fixed array with a linked - // list. Keep in mind this code will be called everytime the lexer + // list. Keep in mind this code will be called every time the lexer // is invoked.
#define INNER_STRINGS_MAX_COUNT 5
Modified: scintilla/src/AutoComplete.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -65,7 +65,7 @@ class AutoComplete { void SetSeparator(char separator_); char GetSeparator() const;
- /// The typesep character is used for seperating the word from the type + /// The typesep character is used for separating the word from the type void SetTypesep(char separator_); char GetTypesep() const;
Modified: scintilla/src/Editor.cxx 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -1219,7 +1219,7 @@ so the caret can move in the same direction longer before the policy is applied
If even is not set, instead of having symmetrical UZs, the left and bottom UZs are extended up to right and top UZs respectively. -This way, we favour the displaying of useful information: the begining of lines, +This way, we favour the displaying of useful information: the beginning of lines, where most code reside, and the lines after the caret, eg. the body of a function.
| | | | | @@ -3846,7 +3846,7 @@ long Editor::FormatRange(bool draw, Sci_RangeToFormat *pfr) { vsPrint.rightMarginWidth = 0;
vsPrint.Refresh(*surfaceMeasure, pdoc->tabInChars); - // Determining width must hapen after fonts have been realised in Refresh + // Determining width must happen after fonts have been realised in Refresh int lineNumberWidth = 0; if (lineNumberIndex >= 0) { lineNumberWidth = static_cast<int>(surfaceMeasure->WidthText(vsPrint.styles[STYLE_LINENUMBER].font, @@ -6409,7 +6409,7 @@ void Editor::ButtonDownWithModifiers(Point pt, unsigned int curTime, int modifie doubleClick = true; } else if (selectionType == selWord) { // Since we ended up here, we're inside a *triple* click, which should always select - // whole line irregardless of word wrap being enabled or not. + // whole line regardless of word wrap being enabled or not. selectionType = selWholeLine; } else { selectionType = selChar; @@ -6837,7 +6837,7 @@ bool Editor::Idle() {
// Add more idle things to do here, but make sure idleDone is // set correctly before the function returns. returning - // false will stop calling this idle funtion until SetIdle() is + // false will stop calling this idle function until SetIdle() is // called again.
idleDone = wrappingDone; // && thatDone && theOtherThingDone...
Modified: scintilla/src/RESearch.cxx 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -784,7 +784,7 @@ int RESearch::Execute(CharacterIndexer &ci, int lp, int endp) { c = *(ap+1); while ((lp < endp) && (static_cast<unsigned char>(ci.CharAt(lp)) != c)) lp++; - if (lp >= endp) /* if EOS, fail, else fall thru. */ + if (lp >= endp) /* if EOS, fail, else fall through. */ return 0; default: /* regular matching all the way. */ while (lp < endp) { @@ -814,7 +814,7 @@ int RESearch::Execute(CharacterIndexer &ci, int lp, int endp) { * * special case optimizations: (nfa[n], nfa[n+1]) * CLO ANY - * We KNOW .* will match everything upto the + * We KNOW .* will match everything up to the * end of line. Thus, directly go to the end of * line, without recursive PMatch calls. As in * the other closure cases, the remaining pattern
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).