averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-02-22 11:54:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix the choices at file-changed dialog

Browse Source
This commit is contained in:
ichizok
2022-02-12 13:07:33 +09:00
parent 4cb9532be0
commit f40cae2b45
1 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/fileio.c
View File

@@ -4256,29 +4256,36 @@ buf_check_timestamp(
STRCAT(tbuf, mesg2);
}
# ifdef FEAT_GUI_MACVIM
if (default_reload_choice > 0)
if (gui.in_use)
{
if (default_reload_choice == 2)
reload = TRUE;
}
else
{
switch (do_dialog(VIM_WARNING, (char_u *)_("Warning"),
(char_u *)tbuf,
(char_u *)_("&OK\n&Load File\nLoad &All\n&Ignore All"),
1, NULL, TRUE))
if (default_reload_choice > 0)
{
case 3:
default_reload_choice = 2;
case 2:
reload = TRUE;
break;
case 4:
default_reload_choice = 1;
break;
if (default_reload_choice == 1)
reload = RELOAD_NORMAL;
}
else
{
switch (do_dialog(VIM_WARNING, (char_u *)_("Warning"),
(char_u *)tbuf,
(char_u *)_("&OK\n&Load File\nLoad &File and Options\nLoad &All\n&Ignore All"),
1, NULL, TRUE))
{
case 4:
default_reload_choice = 1;
case 2:
reload = RELOAD_NORMAL;
break;
case 3:
reload = RELOAD_DETECT;
break;
case 5:
default_reload_choice = 2;
break;
}
}
}
# else
else
# endif
switch (do_dialog(VIM_WARNING, (char_u *)_("Warning"),
(char_u *)tbuf,
(char_u *)_("&OK\n&Load File\nLoad File &and Options"),
@@ -4291,7 +4298,6 @@ buf_check_timestamp(
reload = RELOAD_DETECT;
break;
}
# endif
}
else
#endif