diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-10-19 12:37:42 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-10-19 12:37:42 +0200 |
| commit | 87ffb5c1a3aa506a1be07af4e794b3753f839dc3 (patch) | |
| tree | 397eab50b1669ae9111a6f6fcdac4201abbb9503 | |
| parent | 6daeef1933be68055aabe1d55f8467d46a707753 (diff) | |
| download | vim-git-87ffb5c1a3aa506a1be07af4e794b3753f839dc3.tar.gz | |
patch 8.0.1204: a QuitPre autocommand may get the wrong file namev8.0.1204
Problem: A QuitPre autocommand may get the wrong file name.
Solution: Pass the buffer being closed to apply_autocmds(). (Rich Howe)
| -rw-r--r-- | src/ex_docmd.c | 12 | ||||
| -rw-r--r-- | src/testdir/test_autocmd.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 24 insertions, 4 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 7365d1bd3..905cdd4b0 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -7224,10 +7224,14 @@ ex_quit(exarg_T *eap) wp = curwin; #ifdef FEAT_AUTOCMD - apply_autocmds(EVENT_QUITPRE, NULL, NULL, FALSE, curbuf); - /* Refuse to quit when locked or when the buffer in the last window is - * being closed (can only happen in autocommands). */ - if (curbuf_locked() || !win_valid(wp) + /* Refuse to quit when locked. */ + if (curbuf_locked()) + return; + apply_autocmds(EVENT_QUITPRE, NULL, NULL, FALSE, wp->w_buffer); + /* Bail out when autocommands closed the window. + * Refuse to quit when the buffer in the last window is being closed (can + * only happen in autocommands). */ + if (!win_valid(wp) || (wp->w_buffer->b_nwindows == 1 && wp->w_buffer->b_locked > 0)) return; #endif diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim index 593d1cc40..f5a228995 100644 --- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -779,3 +779,17 @@ func Test_BufLeave_Wipe() " check that bufinfo doesn't contain a pointer to freed memory call test_garbagecollect_now() endfunc + +func Test_QuitPre() + edit Xfoo + let winid = win_getid(winnr()) + split Xbar + au! QuitPre * let g:afile = expand('<afile>') + " Close the other window, <afile> should be correct. + exe win_id2win(winid) . 'q' + call assert_equal('Xfoo', g:afile) + + unlet g:afile + bwipe Xfoo + bwipe Xbar +endfunc diff --git a/src/version.c b/src/version.c index 32140089f..da06043d4 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1204, +/**/ 1203, /**/ 1202, |