diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-07-24 17:34:23 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-07-24 17:34:23 +0000 |
| commit | 4bfa60812d090257a7e2e89846ffdf4fb7994606 (patch) | |
| tree | cb65fbd7bd8a769a4beecbf1ed9adbe1b677bdfc /src | |
| parent | 15bfa09582f6056fb5e69426b1fe36b58026a7e1 (diff) | |
| download | vim-4bfa60812d090257a7e2e89846ffdf4fb7994606.zip | |
updated for version 7.2b-017
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.c | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c index 7718e97c8..a9eb4609c 100644 --- a/src/main.c +++ b/src/main.c @@ -2529,7 +2529,6 @@ edit_buffers(parmp) int arg_idx; /* index in argument list */ int i; int advance = TRUE; - buf_T *old_curbuf; # ifdef FEAT_AUTOCMD /* @@ -2582,21 +2581,26 @@ edit_buffers(parmp) curwin->w_arg_idx = arg_idx; /* Edit file from arg list, if there is one. When "Quit" selected * 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 ? alist_name(&GARGLIST[arg_idx]) : NULL, 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()) { - /* abort selected or quit and only one window */ + /* abort selected and only one window */ did_emsg = FALSE; /* avoid hit-enter prompt */ getout(1); } win_close(curwin, TRUE); advance = FALSE; } +# endif if (arg_idx == GARGCOUNT - 1) arg_had_last = TRUE; ++arg_idx; diff --git a/src/version.c b/src/version.c index 0e2c9ed10..11abe51aa 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 17, +/**/ 16, /**/ 15, |