diff options
| author | Shougo Matsushita <Shougo.Matsu@gmail.com> | 2015-12-13 12:56:24 +0900 |
|---|---|---|
| committer | Shougo Matsushita <Shougo.Matsu@gmail.com> | 2015-12-13 13:01:46 +0900 |
| commit | d1ec3f661a02dd0ea6d7fbf371a16aae336d1e78 (patch) | |
| tree | 45ed0ab3e1ae612ddedbde24527dcd3756df0aeb /src/nvim/buffer.c | |
| parent | f183cc14de40542899f1bad44943695b0ccf0e5c (diff) | |
| download | rneovim-d1ec3f661a02dd0ea6d7fbf371a16aae336d1e78.tar.gz rneovim-d1ec3f661a02dd0ea6d7fbf371a16aae336d1e78.tar.bz2 rneovim-d1ec3f661a02dd0ea6d7fbf371a16aae336d1e78.zip | |
vim-patch:7.4.645
Problem: When splitting the window in a BufAdd autocommand while still in
the first, empty buffer the window count is wrong.
Solution: Do not reset b_nwindows to zero and don't increment it.
https://github.com/vim/vim/commit/8da9bbfd02957b79edd595c8c7397453012510b0
Diffstat (limited to 'src/nvim/buffer.c')
| -rw-r--r-- | src/nvim/buffer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index fae8e9ecd0..762cd3efd3 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -1414,7 +1414,6 @@ buflist_new ( return NULL; if (aborting()) /* autocmds may abort script processing */ return NULL; - /* buf->b_nwindows = 0; why was this here? */ free_buffer_stuff(buf, FALSE); /* delete local variables et al. */ /* Init the options. */ @@ -1475,6 +1474,9 @@ buflist_new ( fmarks_check_names(buf); /* check file marks for this file */ buf->b_p_bl = (flags & BLN_LISTED) ? TRUE : FALSE; /* init 'buflisted' */ if (!(flags & BLN_DUMMY)) { + // Tricky: these autocommands may change the buffer list. They could also + // split the window with re-using the one empty buffer. This may result in + // unexpectedly losing the empty buffer. apply_autocmds(EVENT_BUFNEW, NULL, NULL, FALSE, buf); if (!buf_valid(buf)) { return NULL; |