aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/buffer.c
diff options
context:
space:
mode:
authorGrzegorz Milka <grzegorzmilka@gmail.com>2016-10-18 21:04:57 +0200
committerGrzegorz Milka <grzegorzmilka@gmail.com>2016-10-22 23:43:14 +0200
commit9ca90fdb9fda017962129125ea886fbf07345f62 (patch)
tree8c5003ec5d97666cadb1a20c1cf463c08bf37c78 /src/nvim/buffer.c
parent500c485e36759f23654de3ce792f3d3b68936c01 (diff)
downloadrneovim-9ca90fdb9fda017962129125ea886fbf07345f62.tar.gz
rneovim-9ca90fdb9fda017962129125ea886fbf07345f62.tar.bz2
rneovim-9ca90fdb9fda017962129125ea886fbf07345f62.zip
vim-patch:7.4.2212
Problem: Mark " is not set when closing a window in another tab. (Guraga) Solution: Check all tabs for the window to be valid. (based on patch by Hirohito Higashi, closes vim/vim#974) https://github.com/vim/vim/commit/e59215c7dcae17b03daf39517560cfaa03314f5a
Diffstat (limited to 'src/nvim/buffer.c')
-rw-r--r--src/nvim/buffer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 5fb011885e..176967ad2a 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -323,7 +323,7 @@ void close_buffer(win_T *win, buf_T *buf, int action, int abort_if_last)
wipe_buf = true;
}
- if (win_valid(win)) {
+ if (win_valid_any_tab(win)) {
/* Set b_last_cursor when closing the last window for the buffer.
* Remember the last cursor position and window options of the buffer.
* This used to be only for the current window, but then options like
@@ -402,7 +402,7 @@ void close_buffer(win_T *win, buf_T *buf, int action, int abort_if_last)
buf->b_nwindows = nwindows;
buf_freeall(buf, (del_buf ? BFA_DEL : 0) + (wipe_buf ? BFA_WIPE : 0));
- if (win_valid(win) && win->w_buffer == buf) {
+ if (win_valid_any_tab(win) && win->w_buffer == buf) {
win->w_buffer = NULL; // make sure we don't use the buffer now
}