diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-12-22 19:53:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-22 19:53:44 -0500 |
| commit | d0668b36a3e2d0683059baead45bea27e2358e9c (patch) | |
| tree | c1066da573559e85924cb783082917750cc9b09f /src/nvim/main.c | |
| parent | b931a554d70ef07803da3eb3f98ce4b3a3570d11 (diff) | |
| parent | b602fe74b075b5e3c4f095d907bed9abc98462f3 (diff) | |
| download | rneovim-d0668b36a3e2d0683059baead45bea27e2358e9c.tar.gz rneovim-d0668b36a3e2d0683059baead45bea27e2358e9c.tar.bz2 rneovim-d0668b36a3e2d0683059baead45bea27e2358e9c.zip | |
Merge pull request #13586 from janlazo/vim-8.1.1047
vim-patch:8.1.{1047,1101,1212},8.2.{742,749,769,874,2142,2189,2192}
Diffstat (limited to 'src/nvim/main.c')
| -rw-r--r-- | src/nvim/main.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index ed055e76ba..41ae78e996 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -653,7 +653,18 @@ void getout(int exitval) } } } - apply_autocmds(EVENT_VIMLEAVEPRE, NULL, NULL, FALSE, curbuf); + + int unblock = 0; + // deathtrap() blocks autocommands, but we do want to trigger + // VimLeavePre. + if (is_autocmd_blocked()) { + unblock_autocmds(); + unblock++; + } + apply_autocmds(EVENT_VIMLEAVEPRE, NULL, NULL, false, curbuf); + if (unblock) { + block_autocmds(); + } } if (p_shada && *p_shada != NUL) { |