0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

updated for version 7.0164

This commit is contained in:
Bram Moolenaar
2005-12-07 21:07:59 +00:00
parent 4e330bbf21
commit d5bc83f576
6 changed files with 179 additions and 77 deletions

View File

@@ -116,7 +116,7 @@ static void exe_pre_commands __ARGS((mparm_T *parmp));
static void exe_commands __ARGS((mparm_T *parmp));
static void source_startup_scripts __ARGS((mparm_T *parmp));
static void main_start_gui __ARGS((void));
#if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
#if defined(HAS_SWAP_EXISTS_ACTION)
static void check_swap_exists_action __ARGS((void));
#endif
#ifdef FEAT_CLIENTSERVER
@@ -2150,7 +2150,7 @@ read_stdin()
{
int i;
#if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
#if defined(HAS_SWAP_EXISTS_ACTION)
/* When getting the ATTENTION prompt here, use a dialog */
swap_exists_action = SEA_DIALOG;
#endif
@@ -2161,7 +2161,7 @@ read_stdin()
no_wait_return = FALSE;
msg_didany = i;
TIME_MSG("reading stdin");
#if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
#if defined(HAS_SWAP_EXISTS_ACTION)
check_swap_exists_action();
#endif
#if !(defined(AMIGA) || defined(MACOS))
@@ -2245,14 +2245,14 @@ create_windows(parmp)
if (p_fdls >= 0)
curwin->w_p_fdl = p_fdls;
#endif
#if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
#if defined(HAS_SWAP_EXISTS_ACTION)
/* When getting the ATTENTION prompt here, use a dialog */
swap_exists_action = SEA_DIALOG;
#endif
set_buflisted(TRUE);
(void)open_buffer(FALSE, NULL); /* create memfile, read file */
#if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
#if defined(HAS_SWAP_EXISTS_ACTION)
check_swap_exists_action();
#endif
#ifdef FEAT_AUTOCMD
@@ -2872,7 +2872,7 @@ usage()
mch_exit(0);
}
#if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
#if defined(HAS_SWAP_EXISTS_ACTION)
/*
* Check the result of the ATTENTION dialog:
* When "Quit" selected, exit Vim.