Mercurial > vim
changeset 12652:272ecbaf1b4f v8.0.1204
patch 8.0.1204: a QuitPre autocommand may get the wrong file name
commit https://github.com/vim/vim/commit/87ffb5c1a3aa506a1be07af4e794b3753f839dc3
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Oct 19 12:37:42 2017 +0200
patch 8.0.1204: a QuitPre autocommand may get the wrong file name
Problem: A QuitPre autocommand may get the wrong file name.
Solution: Pass the buffer being closed to apply_autocmds(). (Rich Howe)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 19 Oct 2017 12:45:07 +0200 |
| parents | 456433325479 |
| children | e1e23eb0b699 |
| files | src/ex_docmd.c src/testdir/test_autocmd.vim src/version.c |
| diffstat | 3 files changed, 24 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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