SF.net SVN: geany:[4784] trunk

[ntrel at users.sourceforge.net]

Revision: 4784
          http://geany.svn.sourceforge.net/geany/?rev=4784&view=rev
Author:   ntrel
Date:     2010-03-25 13:43:37 +0000 (Thu, 25 Mar 2010)

Log Message:
-----------
Fix wrong selection range after Replace in Selection.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/document.c
    trunk/src/search.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-03-20 19:57:27 UTC (rev 4783)
+++ trunk/ChangeLog	2010-03-25 13:43:37 UTC (rev 4784)
@@ -1,3 +1,9 @@
+2010-03-25  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/search.c, src/document.c:
+   Fix wrong selection range after Replace in Selection.
+
+
 2010-03-20  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * src/win32.c:

Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c	2010-03-20 19:57:27 UTC (rev 4783)
+++ trunk/src/document.c	2010-03-25 13:43:37 UTC (rev 4784)
@@ -2128,7 +2128,7 @@
 			sci_goto_pos(sci, ttf.chrg.cpMin, TRUE);
 
 		if (new_range_end != NULL)
-			*new_range_end = end;
+			*new_range_end = ttf.chrg.cpMax;
 	}
 	return count;
 }

Modified: trunk/src/search.c
===================================================================
--- trunk/src/search.c	2010-03-20 19:57:27 UTC (rev 4783)
+++ trunk/src/search.c	2010-03-25 13:43:37 UTC (rev 4784)
@@ -1876,7 +1876,8 @@
 }
 
 
-/* ttf is updated to include the last match positions.
+/* ttf is updated to include the last match position (ttf->chrg.cpMin) and
+ * the new search range end (ttf->chrg.cpMax).
  * Note: Normally you would call sci_start/end_undo_action() around this call. */
 /* Warning: Scintilla recommends caching replacements to do all at once to avoid
  * performance issues with SCI_GETCHARACTERPOINTER. */


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