mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4525_mcedit_replace_regex' 

* 4525_mcedit_replace_regex:
  (edit_search_init): call edit_search_fix_search_start_if_selection().
  Tickets #4525, #4526: mcedit: fix replacement using regular expressions.
This commit is contained in:
Andrew Borodin 2024-02-11 19:10:32 +03:00
parent c1832fd586 f87a6ae312
commit a58e0a1d61
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/editor/editsearch.c
View File

@ -668,11 +668,7 @@ static void
edit_search (WEdit * edit)
{
if (edit_dialog_search_show (edit))
{
edit->search_line_type = edit_get_search_line_type (edit->search);
edit_search_fix_search_start_if_selection (edit);
edit_do_search (edit);
}
}
/* --------------------------------------------------------------------------------------------- */
@ -700,6 +696,10 @@ edit_search_init (WEdit * edit, const char *str)
edit->search->search_fn = edit_search_cmd_callback;
edit->search->update_fn = edit_search_update_callback;
edit->search_line_type = edit_get_search_line_type (edit->search);
edit_search_fix_search_start_if_selection (edit);
return TRUE;
}
@ -876,15 +876,10 @@ edit_replace_cmd (WEdit * edit, gboolean again)
input2_str = g_string_new_take (input2);
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;
goto cleanup;
}
edit->search_start = edit->buffer.curs1;
goto cleanup;
}
if (edit->found_len != 0 && edit->search_start == edit->found_start + 1