mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 12:56:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

(editcmd_find): minor refactoring.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2016-04-30 15:39:05 +03:00
parent 74e671fb59
commit 90c67f9220
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/editor/editcmd.c
View File

@ -837,27 +837,24 @@ editcmd_find (edit_search_status_msg_t * esm, gsize * len)
if ((edit->search_line_type & AT_START_LINE) != 0 if ((edit->search_line_type & AT_START_LINE) != 0
&& (start_mark != 0 && (start_mark != 0
|| edit_buffer_get_byte (&edit->buffer, start_mark - 1) != end_string_symbol)) || edit_buffer_get_byte (&edit->buffer, start_mark - 1) != end_string_symbol))
{
start_mark = start_mark =
edit_calculate_start_of_next_line (&edit->buffer, start_mark, edit->buffer.size, edit_calculate_start_of_next_line (&edit->buffer, start_mark, edit->buffer.size,
end_string_symbol); end_string_symbol);
}
if ((edit->search_line_type & AT_END_LINE) != 0 if ((edit->search_line_type & AT_END_LINE) != 0
&& (end_mark - 1 != edit->buffer.size && (end_mark - 1 != edit->buffer.size
|| edit_buffer_get_byte (&edit->buffer, end_mark) != end_string_symbol)) || edit_buffer_get_byte (&edit->buffer, end_mark) != end_string_symbol))
end_mark = end_mark =
edit_calculate_end_of_previous_line (&edit->buffer, end_mark, end_string_symbol); edit_calculate_end_of_previous_line (&edit->buffer, end_mark, end_string_symbol);
if (start_mark >= end_mark) if (start_mark >= end_mark)
{ {
mc_search_set_error (edit->search, MC_SEARCH_E_NOTFOUND, "%s", _(STR_E_NOTFOUND)); mc_search_set_error (edit->search, MC_SEARCH_E_NOTFOUND, "%s", _(STR_E_NOTFOUND));
return FALSE; return FALSE;
} }
} }
else else if (edit_search_options.backwards)
{
if (edit_search_options.backwards)
end_mark = MAX (1, edit->buffer.curs1) - 1; end_mark = MAX (1, edit->buffer.curs1) - 1;
}
/* search */ /* search */
if (edit_search_options.backwards) if (edit_search_options.backwards)
@ -893,18 +890,17 @@ editcmd_find (edit_search_status_msg_t * esm, gsize * len)
} }
mc_search_set_error (edit->search, MC_SEARCH_E_NOTFOUND, "%s", _(STR_E_NOTFOUND)); mc_search_set_error (edit->search, MC_SEARCH_E_NOTFOUND, "%s", _(STR_E_NOTFOUND));
return FALSE;
} }
else
{
/* forward search */ /* forward search */
if ((edit->search_line_type & AT_START_LINE) != 0 && search_start != start_mark) if ((edit->search_line_type & AT_START_LINE) != 0 && search_start != start_mark)
search_start = search_start =
edit_calculate_start_of_next_line (&edit->buffer, search_start, end_mark, edit_calculate_start_of_next_line (&edit->buffer, search_start, end_mark,
end_string_symbol); end_string_symbol);
return mc_search_run (edit->search, (void *) esm, search_start, end_mark, len); return mc_search_run (edit->search, (void *) esm, search_start, end_mark, len);
} }
return FALSE;
}
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */