mirror of
https://github.com/neovim/neovim
synced 2025-07-16 09:11:51 +00:00
vim-patch:9.0.1538: :wqall does not trigger ExitPre (#23574)
Problem: :wqall does not trigger ExitPre. (Bart Libert)
Solution: Move preparations for :qall to a common function. (closes vim/vim#12374)
411da64e77
Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
@ -1926,6 +1926,9 @@ void do_wqall(exarg_T *eap)
|
||||
int save_forceit = eap->forceit;
|
||||
|
||||
if (eap->cmdidx == CMD_xall || eap->cmdidx == CMD_wqall) {
|
||||
if (before_quit_all(eap) == FAIL) {
|
||||
return;
|
||||
}
|
||||
exiting = true;
|
||||
}
|
||||
|
||||
|
@ -4589,8 +4589,9 @@ static void ex_cquit(exarg_T *eap)
|
||||
getout(eap->addr_count > 0 ? (int)eap->line2 : EXIT_FAILURE);
|
||||
}
|
||||
|
||||
/// ":qall": try to quit all windows
|
||||
static void ex_quit_all(exarg_T *eap)
|
||||
/// Do preparations for "qall" and "wqall".
|
||||
/// Returns FAIL when quitting should be aborted.
|
||||
int before_quit_all(exarg_T *eap)
|
||||
{
|
||||
if (cmdwin_type != 0) {
|
||||
if (eap->forceit) {
|
||||
@ -4598,19 +4599,28 @@ static void ex_quit_all(exarg_T *eap)
|
||||
} else {
|
||||
cmdwin_result = K_XF2;
|
||||
}
|
||||
return;
|
||||
return FAIL;
|
||||
}
|
||||
|
||||
// Don't quit while editing the command line.
|
||||
if (text_locked()) {
|
||||
text_locked_msg();
|
||||
return;
|
||||
return FAIL;
|
||||
}
|
||||
|
||||
if (before_quit_autocmds(curwin, true, eap->forceit)) {
|
||||
return;
|
||||
return FAIL;
|
||||
}
|
||||
|
||||
return OK;
|
||||
}
|
||||
|
||||
/// ":qall": try to quit all windows
|
||||
static void ex_quit_all(exarg_T *eap)
|
||||
{
|
||||
if (before_quit_all(eap) == FAIL) {
|
||||
return;
|
||||
}
|
||||
exiting = true;
|
||||
if (eap->forceit || !check_changed_any(false, false)) {
|
||||
getout(0);
|
||||
|
@ -81,6 +81,18 @@ func Test_exiting()
|
||||
\ readfile('Xtestout'))
|
||||
endif
|
||||
call delete('Xtestout')
|
||||
|
||||
" ExitPre autocommand also executed on :wqall
|
||||
let after =<< trim [CODE]
|
||||
au QuitPre * call writefile(["QuitPre"], "Xtestout", "a")
|
||||
au ExitPre * call writefile(["ExitPre"], "Xtestout", "a")
|
||||
wqall
|
||||
[CODE]
|
||||
|
||||
if RunVim([], after, '')
|
||||
call assert_equal(['QuitPre', 'ExitPre'], readfile('Xtestout'))
|
||||
endif
|
||||
call delete('Xtestout')
|
||||
endfunc
|
||||
|
||||
" Test for getting the Vim exit code from v:exiting
|
||||
|
Reference in New Issue
Block a user