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

Merge branch '3179_not_found_dialog_uniq'

Browse Source 
* 3179_not_found_dialog_uniq:
  Ticket #3179: do not consider "String not found" mwssage as error.
This commit is contained in:
Andrew Borodin 2014-03-18 21:10:33 +04:00
commit dee4d1101e
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/diffviewer/search.c
View File

@ -229,7 +229,7 @@ mcdiffview_do_search (WDiff * dview)
if (!present_result)
{
dview->search.last_found_line = -1;
error_dialog (_("Search"), _("Search string not found"));
query_dialog (_("Search"), _("Search string not found"), D_NORMAL, 1, _("&Dismiss"));
}
}

2
src/editor/edit-impl.h
View File

@ -72,7 +72,7 @@
#define get_sys_error(s) (s)
#define edit_error_dialog(h,s) query_dialog (h, s, D_ERROR, 1, _("&Dismiss"))
#define edit_query_dialog(h,s) query_dialog (h, s, D_NORMAL, 1, _("&Dismiss"))
#define edit_query_dialog2(h,t,a,b) query_dialog (h, t, D_NORMAL, 2, a, b)
#define edit_query_dialog3(h,t,a,b,c) query_dialog (h, t, D_NORMAL, 3, a, b, c)

4
src/editor/editcmd.c
View File

@ -977,7 +977,7 @@ edit_do_search (WEdit * edit)
{
edit->search_start = edit->buffer.curs1;
if (edit->search->error_str != NULL)
edit_error_dialog (_("Search"), edit->search->error_str);
edit_query_dialog (_("Search"), edit->search->error_str);
}
}
@ -2549,7 +2549,7 @@ edit_replace_cmd (WEdit * edit, int again)
if (!(edit->search->error == MC_SEARCH_E_OK ||
(once_found && edit->search->error == MC_SEARCH_E_NOTFOUND)))
{
edit_error_dialog (_("Search"), edit->search->error_str);
edit_query_dialog (_("Search"), edit->search->error_str);
}
break;
}

2
src/viewer/search.c
View File

@ -343,7 +343,7 @@ mcview_do_search (mcview_t * view)
}
if (!isFound && view->search->error_str != NULL)
message (D_NORMAL, _("Search"), "%s", view->search->error_str);
query_dialog (_("Search"), view->search->error_str, D_NORMAL, 1, _("&Dismiss"));
view->dirty++;
mcview_update (view);