Mercurial > vim
diff src/ex_docmd.c @ 24723:5194fba32954 v8.2.2900
patch 8.2.2900: QuitPre is triggered before :wq writes the file
Commit: https://github.com/vim/vim/commit/1174b018a6d705ddb8c04f3d21f78ae760aa0856
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat May 29 14:30:43 2021 +0200
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)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 29 May 2021 14:45:03 +0200 |
| parents | 4ae10e6c3a9c |
| children | 7334bf933510 |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -6089,7 +6089,7 @@ ex_stop(exarg_T *eap) } /* - * ":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 @@ ex_exit(exarg_T *eap) 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))) {