diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-12-21 09:28:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-21 09:28:26 -0500 |
| commit | f15441be4b6697a4917f5edd99d403d5c953e66c (patch) | |
| tree | 142f01b78c29051cf360ad3ada0efac6bd3e6d3f /src/nvim/main.c | |
| parent | a1ec36ff31ff1fd545dd135faa47dc782b41a687 (diff) | |
| parent | ebb0cbc6cccb0b75507815939aa761ae625ba0df (diff) | |
| download | rneovim-f15441be4b6697a4917f5edd99d403d5c953e66c.tar.gz rneovim-f15441be4b6697a4917f5edd99d403d5c953e66c.tar.bz2 rneovim-f15441be4b6697a4917f5edd99d403d5c953e66c.zip | |
Merge pull request #13573 from janlazo/vim-8.1.1872
vim-patch:8.1.1872,8.2.1966
Diffstat (limited to 'src/nvim/main.c')
| -rw-r--r-- | src/nvim/main.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index fd8264583b..ed055e76ba 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -662,7 +662,17 @@ void getout(int exitval) } if (v_dying <= 1) { + int unblock = 0; + + // deathtrap() blocks autocommands, but we do want to trigger VimLeave. + if (is_autocmd_blocked()) { + unblock_autocmds(); + unblock++; + } apply_autocmds(EVENT_VIMLEAVE, NULL, NULL, false, curbuf); + if (unblock) { + block_autocmds(); + } } profile_dump(); |