patch 8.2.2900: QuitPre is triggered before :wq writes the file
Problem: QuitPre is triggered before :wq writes the file, which is
different from other commands.
Solution: Trigger QuitPre after writing the file. (closes #8279)
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 58dad65..9c8eba5 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -6089,7 +6089,7 @@
}
/*
- * ":exit", ":xit" and ":wq": Write file and quite the current window.
+ * ":exit", ":xit" and ":wq": Write file and quit the current window.
*/
static void
ex_exit(exarg_T *eap)
@@ -6112,17 +6112,17 @@
return;
}
- if (before_quit_autocmds(curwin, FALSE, eap->forceit))
- return;
-
/*
- * if more files or windows we won't exit
+ * we plan to exit if there is only one relevant window
*/
if (check_more(FALSE, eap->forceit) == OK && only_one_window())
exiting = TRUE;
- if ( ((eap->cmdidx == CMD_wq
- || curbufIsChanged())
- && do_write(eap) == FAIL)
+
+ // Write the buffer for ":wq" or when it was changed.
+ // Trigger QuitPre and ExitPre.
+ // Check if we can exit now, after autocommands have changed things.
+ if (((eap->cmdidx == CMD_wq || curbufIsChanged()) && do_write(eap) == FAIL)
+ || before_quit_autocmds(curwin, FALSE, eap->forceit)
|| check_more(TRUE, eap->forceit) == FAIL
|| (only_one_window() && check_changed_any(eap->forceit, FALSE)))
{
diff --git a/src/testdir/test_writefile.vim b/src/testdir/test_writefile.vim
index e4293e3..e94071f 100644
--- a/src/testdir/test_writefile.vim
+++ b/src/testdir/test_writefile.vim
@@ -915,4 +915,25 @@
call delete('Xfile3')
endfunc
+" Check that buffer is written before triggering QuitPre
+func Test_wq_quitpre_autocommand()
+ edit Xsomefile
+ call setline(1, 'hello')
+ split
+ let g:seq = []
+ augroup Testing
+ au QuitPre * call add(g:seq, 'QuitPre - ' .. (&modified ? 'modified' : 'not modified'))
+ au BufWritePost * call add(g:seq, 'written')
+ augroup END
+ wq
+ call assert_equal(['written', 'QuitPre - not modified'], g:seq)
+
+ augroup Testing
+ au!
+ augroup END
+ bwipe!
+ unlet g:seq
+ call delete('Xsomefile')
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 9e3ba0f..4223259 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2900,
+/**/
2899,
/**/
2898,