SF.net SVN: geany:[3960] trunk

[ntrel at users.sourceforge.net]

Revision: 3960
          http://geany.svn.sourceforge.net/geany/?rev=3960&view=rev
Author:   ntrel
Date:     2009-07-14 10:32:32 +0000 (Tue, 14 Jul 2009)

Log Message:
-----------
Properly fix wrong brace highlighting of non-brace character.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/editor.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-07-14 07:15:31 UTC (rev 3959)
+++ trunk/ChangeLog	2009-07-14 10:32:32 UTC (rev 3960)
@@ -1,3 +1,9 @@
+2009-07-14  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/editor.c:
+   Properly fix wrong brace highlighting of non-brace character.
+
+
 2009-07-13  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/highlighting.c, src/about.c, src/filetypes.c, src/document.c,

Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c	2009-07-14 07:15:31 UTC (rev 3959)
+++ trunk/src/editor.c	2009-07-14 10:32:32 UTC (rev 3960)
@@ -3060,8 +3060,10 @@
 		}
 	}
 	if (!utils_isbrace(sci_get_char_at(editor->sci, brace_pos), editor_prefs.brace_match_ltgt))
+	{
+		editor_highlight_braces(editor, cur_pos);
 		return FALSE;
-
+	}
 	end_pos = sci_find_matching_brace(editor->sci, brace_pos);
 
 	if (end_pos >= 0)
@@ -3084,13 +3086,14 @@
 {
 	gint brace_pos = cur_pos - 1;
 
+	SSM(editor->sci, SCI_SETHIGHLIGHTGUIDE, 0, 0);
+	SSM(editor->sci, SCI_BRACEBADLIGHT, (uptr_t)-1, 0);
+
 	if (! utils_isbrace(sci_get_char_at(editor->sci, brace_pos), editor_prefs.brace_match_ltgt))
 	{
 		brace_pos++;
 		if (! utils_isbrace(sci_get_char_at(editor->sci, brace_pos), editor_prefs.brace_match_ltgt))
 		{
-			SSM(editor->sci, SCI_SETHIGHLIGHTGUIDE, 0, 0);
-			SSM(editor->sci, SCI_BRACEBADLIGHT, (uptr_t)-1, 0);
 			return;
 		}
 	}


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