aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/main.c
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2017-02-06 10:20:49 -0500
committerGitHub <noreply@github.com>2017-02-06 10:20:49 -0500
commit11efbc80e328d6e92bdb1cdcf6aeac98050c2077 (patch)
treeffd45f3dab501339999687416c8a3a1e577d899f /src/nvim/main.c
parenta767fee8cd0e6874e528d88f5a8dcf70259dabdd (diff)
parentb0cf071d437699b9b89e3735b3df41914f302eb1 (diff)
downloadrneovim-11efbc80e328d6e92bdb1cdcf6aeac98050c2077.tar.gz
rneovim-11efbc80e328d6e92bdb1cdcf6aeac98050c2077.tar.bz2
rneovim-11efbc80e328d6e92bdb1cdcf6aeac98050c2077.zip
Merge pull request #5913 from mhinz/buf-lookup-patches
vim-patch:7.4.2017,7.4.2018,7.4.2021,7.4.2022,7.4.2023,7.4.2024
Diffstat (limited to 'src/nvim/main.c')
-rw-r--r--src/nvim/main.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 6194e5f948..88c1990786 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -588,10 +588,13 @@ void getout(int exitval)
/* Trigger BufUnload for buffers that are loaded */
FOR_ALL_BUFFERS(buf) {
if (buf->b_ml.ml_mfp != NULL) {
- apply_autocmds(EVENT_BUFUNLOAD, buf->b_fname, buf->b_fname,
- FALSE, buf);
- if (!buf_valid(buf)) /* autocmd may delete the buffer */
+ bufref_T bufref;
+ set_bufref(&bufref, buf);
+ apply_autocmds(EVENT_BUFUNLOAD, buf->b_fname, buf->b_fname, false, buf);
+ if (!bufref_valid(&bufref)) {
+ // Autocmd deleted the buffer.
break;
+ }
}
}
apply_autocmds(EVENT_VIMLEAVEPRE, NULL, NULL, FALSE, curbuf);