From f7c739923c5bb3d1b4e697acd788d16473c340e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sun, 28 Feb 2010 12:56:19 +0000 Subject: [PATCH] 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 --- ChangeLog | 7 +++++++ scintilla/LexR.cxx | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16f80dc9..9b49a458 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-02-28 Enrico Tröger + + * scintilla/LexR.cxx: + Backport R lexer from Scintilla CVS to fix case sensitive keywords + (Scintilla bug #2956543). + + 2010-02-28 Frank Lanitz * src/ui_utils.c: diff --git a/scintilla/LexR.cxx b/scintilla/LexR.cxx index 67e779f5..cabbf578 100644 --- a/scintilla/LexR.cxx +++ b/scintilla/LexR.cxx @@ -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)) {