Kaydet (Commit) e8573df8 authored tarafından Nick Treleaven's avatar Nick Treleaven

Fix wrong match length when using Mark with regex.


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3974 ea778897-0a13-0410-b9d1-a72fbfd435f5
üst a25c0efb
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
* src/search.c: * src/search.c:
Make Mark All keybinding clear search highlighting when there's no Make Mark All keybinding clear search highlighting when there's no
current word. current word.
* src/search.c:
Fix wrong match length when using Mark with regex.
2009-07-15 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> 2009-07-15 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
......
...@@ -974,8 +974,6 @@ gint search_mark_all(GeanyDocument *doc, const gchar *search_text, gint flags) ...@@ -974,8 +974,6 @@ gint search_mark_all(GeanyDocument *doc, const gchar *search_text, gint flags)
if (!NZV(search_text)) if (!NZV(search_text))
return 0; return 0;
len = strlen(search_text);
ttf.chrg.cpMin = 0; ttf.chrg.cpMin = 0;
ttf.chrg.cpMax = sci_get_length(doc->editor->sci); ttf.chrg.cpMax = sci_get_length(doc->editor->sci);
ttf.lpstrText = (gchar *)search_text; ttf.lpstrText = (gchar *)search_text;
...@@ -984,7 +982,9 @@ gint search_mark_all(GeanyDocument *doc, const gchar *search_text, gint flags) ...@@ -984,7 +982,9 @@ gint search_mark_all(GeanyDocument *doc, const gchar *search_text, gint flags)
pos = sci_find_text(doc->editor->sci, flags, &ttf); pos = sci_find_text(doc->editor->sci, flags, &ttf);
if (pos == -1) break; if (pos == -1) break;
editor_indicator_set_on_range(doc->editor, GEANY_INDICATOR_SEARCH, pos, pos + len); len = ttf.chrgText.cpMax - ttf.chrgText.cpMin;
if (len)
editor_indicator_set_on_range(doc->editor, GEANY_INDICATOR_SEARCH, pos, pos + len);
ttf.chrg.cpMin = ttf.chrgText.cpMax + 1; ttf.chrg.cpMin = ttf.chrgText.cpMax + 1;
count++; count++;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment