Backport R lexer from Scintilla CVS to fix case sensitive keywords (Scintilla bug #2956543).

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4708 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2010-02-28 12:56:19 +00:00
parent 40b658e54b
commit f7c739923c
2 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,10 @@
2010-02-28 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* scintilla/LexR.cxx:
Backport R lexer from Scintilla CVS to fix case sensitive keywords
(Scintilla bug #2956543).
2010-02-28 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
* src/ui_utils.c:

View File

@ -77,9 +77,9 @@ static void ColouriseRDoc(unsigned int startPos, int length, int initStyle, Word
sc.SetState(SCE_R_DEFAULT);
}
} else if (sc.state == SCE_R_IDENTIFIER) {
if (!IsAWordChar(sc.ch) || (sc.ch == '.')) {
if (!IsAWordChar(sc.ch)) {
char s[100];
sc.GetCurrentLowered(s, sizeof(s));
sc.GetCurrent(s, sizeof(s));
if (keywords.InList(s)) {
sc.ChangeState(SCE_R_KWORD);
} else if (keywords2.InList(s)) {