mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-02-08 11:24:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

(edit_search_init): call edit_search_fix_search_start_if_selection().

Browse Source 
* (edit_search): do not call edit_search_fix_search_start_if_selection()
  since it called in edit_search_init().
  * (edit_replace_cmd): likewise; join two ifs.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2024-01-31 21:35:32 +03:00
parent 40e773908c
commit f87a6ae312
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/editor/editsearch.c
View File

@ -668,10 +668,7 @@ static void
edit_search (WEdit * edit) edit_search (WEdit * edit)
{ {
if (edit_dialog_search_show (edit)) if (edit_dialog_search_show (edit))
{
edit_search_fix_search_start_if_selection (edit);
edit_do_search (edit); edit_do_search (edit);
}
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
@ -701,6 +698,8 @@ edit_search_init (WEdit * edit, const char *str)
edit->search_line_type = edit_get_search_line_type (edit->search); edit->search_line_type = edit_get_search_line_type (edit->search);
edit_search_fix_search_start_if_selection (edit);
return TRUE; return TRUE;
} }
@ -877,16 +876,11 @@ edit_replace_cmd (WEdit * edit, gboolean again)
input2_str = g_string_new_take (input2); input2_str = g_string_new_take (input2);
input2 = NULL; input2 = NULL;
if (edit->search == NULL) if (edit->search == NULL && !edit_search_init (edit, input1))
{
if (edit_search_init (edit, input1))
edit_search_fix_search_start_if_selection (edit);
else
{ {
edit->search_start = edit->buffer.curs1; edit->search_start = edit->buffer.curs1;
goto cleanup; goto cleanup;
} }
}
if (edit->found_len != 0 && edit->search_start == edit->found_start + 1 if (edit->found_len != 0 && edit->search_start == edit->found_start + 1
&& edit_search_options.backwards) && edit_search_options.backwards)