aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

updated for version 7.2b-017

Browse Source
This commit is contained in:
Bram Moolenaar
2008-07-24 17:34:23 +00:00
parent 15bfa09582
commit 4bfa60812d
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.c
View File

@@ -2529,7 +2529,6 @@ edit_buffers(parmp)
int arg_idx; /* index in argument list */ int arg_idx; /* index in argument list */
int i; int i;
int advance = TRUE; int advance = TRUE;
buf_T *old_curbuf;
# ifdef FEAT_AUTOCMD # ifdef FEAT_AUTOCMD
/* /*
@@ -2582,21 +2581,26 @@ edit_buffers(parmp)
curwin->w_arg_idx = arg_idx; curwin->w_arg_idx = arg_idx;
/* Edit file from arg list, if there is one. When "Quit" selected /* Edit file from arg list, if there is one. When "Quit" selected
* at the ATTENTION prompt close the window. */ * at the ATTENTION prompt close the window. */
old_curbuf = curbuf; # ifdef HAS_SWAP_EXISTS_ACTION
swap_exists_did_quit = FALSE;
# endif
(void)do_ecmd(0, arg_idx < GARGCOUNT (void)do_ecmd(0, arg_idx < GARGCOUNT
? alist_name(&GARGLIST[arg_idx]) : NULL, ? alist_name(&GARGLIST[arg_idx]) : NULL,
NULL, NULL, ECMD_LASTL, ECMD_HIDE); NULL, NULL, ECMD_LASTL, ECMD_HIDE);
if (curbuf == old_curbuf) # ifdef HAS_SWAP_EXISTS_ACTION
if (swap_exists_did_quit)
{ {
/* abort or quit selected */
if (got_int || only_one_window()) if (got_int || only_one_window())
{ {
/* abort selected or quit and only one window */ /* abort selected and only one window */
did_emsg = FALSE; /* avoid hit-enter prompt */ did_emsg = FALSE; /* avoid hit-enter prompt */
getout(1); getout(1);
} }
win_close(curwin, TRUE); win_close(curwin, TRUE);
advance = FALSE; advance = FALSE;
} }
# endif
if (arg_idx == GARGCOUNT - 1) if (arg_idx == GARGCOUNT - 1)
arg_had_last = TRUE; arg_had_last = TRUE;
++arg_idx; ++arg_idx;

2
src/version.c
View File

@@ -676,6 +676,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
17,
/**/ /**/
16, 16,
/**/ /**/