SF.net SVN: geany:[4708] trunk

[eht16 at users.sourceforge.net]

Revision: 4708
          http://geany.svn.sourceforge.net/geany/?rev=4708&view=rev
Author:   eht16
Date:     2010-02-28 12:56:19 +0000 (Sun, 28 Feb 2010)

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

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/scintilla/LexR.cxx

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-02-28 01:04:19 UTC (rev 4707)
+++ trunk/ChangeLog	2010-02-28 12:56:19 UTC (rev 4708)
@@ -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:

Modified: trunk/scintilla/LexR.cxx
===================================================================
--- trunk/scintilla/LexR.cxx	2010-02-28 01:04:19 UTC (rev 4707)
+++ trunk/scintilla/LexR.cxx	2010-02-28 12:56:19 UTC (rev 4708)
@@ -77,9 +77,9 @@
 				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)) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.