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

Merge branch '3720_mcview_search_error_messages'

Browse Source 
* 3720_mcview_search_error_messages:
  Ticket #3720: make viewer show search error messages.
This commit is contained in:
Andrew Borodin 2016-11-21 11:01:46 +03:00
commit da538f0b99
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/viewer/search.c
View File

@ -153,8 +153,9 @@ mcview_find (mcview_search_status_msg_t * ssm, off_t search_start, off_t search_
return TRUE; return TRUE;
} }
/* Abort search. */ /* We abort the search in case of a pattern error, or if the user aborts
if (!ok && view->search->error == MC_SEARCH_E_ABORT) the search. In other words: in all cases except "string not found". */
if (!ok && view->search->error != MC_SEARCH_E_NOTFOUND)
return FALSE; return FALSE;
search_start--; search_start--;
@ -374,7 +375,8 @@ mcview_do_search (WView * view, off_t want_search_start)
status_msg_deinit (STATUS_MSG (&vsm)); status_msg_deinit (STATUS_MSG (&vsm));
if (orig_search_start != 0 && !found && !mcview_search_options.backwards) if (orig_search_start != 0 && (!found && view->search->error == MC_SEARCH_E_NOTFOUND)
&& !mcview_search_options.backwards)
{ {
view->search_start = orig_search_start; view->search_start = orig_search_start;
mcview_update (view); mcview_update (view);
@ -406,9 +408,7 @@ mcview_do_search (WView * view, off_t want_search_start)
} }
} }
if (!found if (!found)
&& (view->search->error == MC_SEARCH_E_ABORT
|| view->search->error == MC_SEARCH_E_NOTFOUND))
{ {
view->search_start = orig_search_start; view->search_start = orig_search_start;
mcview_update (view); mcview_update (view);