diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-01-29 00:06:49 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-01-29 00:06:49 -0500 |
| commit | d671dae58cbf796c864ef23ef0d121679cf612c4 (patch) | |
| tree | 7124f9214e5cf520d0339851783bafefae5b60eb /src | |
| parent | aa8b3b60ee03e4b6a5e664bc16f177893b2ba309 (diff) | |
| parent | aa17b4b4bc3c9134e2c0316d31be3bb000e46a56 (diff) | |
| download | rneovim-d671dae58cbf796c864ef23ef0d121679cf612c4.tar.gz rneovim-d671dae58cbf796c864ef23ef0d121679cf612c4.tar.bz2 rneovim-d671dae58cbf796c864ef23ef0d121679cf612c4.zip | |
Merge pull request #4124 from justinmk/vim-7.4.1137
vim-patch:7.4.1137
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/version.c | 4 | ||||
| -rw-r--r-- | src/nvim/window.c | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c index c73c7805a7..0d62445483 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -69,6 +69,10 @@ static char *features[] = { // clang-format off static int included_patches[] = { + 1137, + + + 1081, diff --git a/src/nvim/window.c b/src/nvim/window.c index 853f8755c3..191cb04d75 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -1913,9 +1913,16 @@ int win_close(win_T *win, int free_buf) */ if (win->w_buffer != NULL) { win->w_closing = true; - close_buffer(win, win->w_buffer, free_buf ? DOBUF_UNLOAD : 0, TRUE); - if (win_valid(win)) + close_buffer(win, win->w_buffer, free_buf ? DOBUF_UNLOAD : 0, true); + if (win_valid(win)) { win->w_closing = false; + } + + // Make sure curbuf is valid. It can become invalid if 'bufhidden' is + // "wipe". + if (!buf_valid(curbuf)) { + curbuf = firstbuf; + } } if (only_one_window() && win_valid(win) && win->w_buffer == NULL |