diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-10-22 21:09:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-22 21:09:45 -0700 |
| commit | 53b025887e28888f8dba78ff57afc001d1a6428b (patch) | |
| tree | 0836a3446072830f061f4c4edbe6b28a26f3f88c /src/nvim/ex_docmd.c | |
| parent | 9e4db2ef508b02583c7f30d12c045ccc07328f16 (diff) | |
| parent | c067efa696698d455d9a1488c26e0fb5d8cb5bf5 (diff) | |
| download | rneovim-53b025887e28888f8dba78ff57afc001d1a6428b.tar.gz rneovim-53b025887e28888f8dba78ff57afc001d1a6428b.tar.bz2 rneovim-53b025887e28888f8dba78ff57afc001d1a6428b.zip | |
Merge #11261 from janlazo/vim-8.1.2185
vim-patch:8.1.{2185,2188,2190,2197}
Diffstat (limited to 'src/nvim/ex_docmd.c')
| -rw-r--r-- | src/nvim/ex_docmd.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 0da2cd67d6..ae3fb4fbfb 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -6070,9 +6070,11 @@ static bool before_quit_autocmds(win_T *wp, bool quit_all, int forceit) if (quit_all || (check_more(false, forceit) == OK && only_one_window())) { apply_autocmds(EVENT_EXITPRE, NULL, NULL, false, curbuf); - // Refuse to quit when locked or when the buffer in the last window is - // being closed (can only happen in autocommands). - if (curbuf_locked() + // Refuse to quit when locked or when the window was closed or the + // buffer in the last window is being closed (can only happen in + // autocommands). + if (!win_valid(wp) + || curbuf_locked() || (curbuf->b_nwindows == 1 && curbuf->b_locked > 0)) { return true; } |