SF.net SVN: geany: [958] trunk

[eht16 at users.sourceforge.net]

Revision: 958
          http://svn.sourceforge.net/geany/?rev=958&view=rev
Author:   eht16
Date:     2006-11-01 08:52:16 -0800 (Wed, 01 Nov 2006)

Log Message:
-----------
Fixed wrong detection of some words.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-11-01 16:40:55 UTC (rev 957)
+++ trunk/ChangeLog	2006-11-01 16:52:16 UTC (rev 958)
@@ -3,6 +3,7 @@
  * src/search.c: Changed tooltip of checkbox "Close dialog" to be more
                  descriptive.
  * src/keybindings.c: Changed keybinding for Print to Ctrl+C.
+ * scintilla/LexBash.cxx: Fixed wrong detection of some words.
 
 
 2006-11-01  Nick Treleaven  <nick.treleaven at btinternet.com>

Modified: trunk/scintilla/LexBash.cxx
===================================================================
--- trunk/scintilla/LexBash.cxx	2006-11-01 16:40:55 UTC (rev 957)
+++ trunk/scintilla/LexBash.cxx	2006-11-01 16:52:16 UTC (rev 958)
@@ -338,7 +338,8 @@
 				HereDoc.Indent = false;
 			} else if (ch == '-'	// file test operators
 			           && isSingleCharOp(chNext)
-			           && !isalnum((chNext2 = styler.SafeGetCharAt(i+2)))) {
+			           && !isalnum((chNext2 = styler.SafeGetCharAt(i+2)))
+			           && isspace(chPrev)) {
 				styler.ColourTo(i + 1, SCE_SH_WORD);
 				state = SCE_SH_DEFAULT;
 				i++;


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