Merge branch '3735_mcedit_search_error_messages'

* 3735_mcedit_search_error_messages:
  Ticket #3735: mcedit: show backwards-search error messages.
This commit is contained in:
Andrew Borodin 2016-12-04 10:18:40 +03:00
commit 74cf8f4bee

View File

@ -868,8 +868,9 @@ editcmd_find (edit_search_status_msg_t * esm, gsize * len)
if (ok && edit->search->normal_offset == search_start) if (ok && edit->search->normal_offset == search_start)
return TRUE; return TRUE;
/* Abort search. */ /* We abort the search in case of a pattern error, or if the user aborts
if (!ok && edit->search->error == MC_SEARCH_E_ABORT) the search. In other words: in all cases except "string not found". */
if (!ok && edit->search->error != MC_SEARCH_E_NOTFOUND)
return FALSE; return FALSE;
if ((edit->search_line_type & AT_START_LINE) != 0) if ((edit->search_line_type & AT_START_LINE) != 0)