diff options
| -rw-r--r-- | src/nvim/window.c | 3 | ||||
| -rw-r--r-- | test/functional/ui/float_spec.lua | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c index cc20a5fcec..236663dfea 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -2464,7 +2464,8 @@ void close_windows(buf_T *buf, bool keep_curwin) for (tp = first_tabpage; tp != NULL; tp = nexttp) { nexttp = tp->tp_next; if (tp != curtab) { - FOR_ALL_WINDOWS_IN_TAB(wp, tp) { + // Start from tp_lastwin to close floating windows with the same buffer first. + for (win_T *wp = tp->tp_lastwin; wp != NULL; wp = wp->w_prev) { if (wp->w_buffer == buf && !(wp->w_closing || wp->w_buffer->b_locked > 0)) { win_close_othertab(wp, false, tp); diff --git a/test/functional/ui/float_spec.lua b/test/functional/ui/float_spec.lua index a5a664cb3d..5e819f14a3 100644 --- a/test/functional/ui/float_spec.lua +++ b/test/functional/ui/float_spec.lua @@ -596,6 +596,11 @@ describe('float window', function() meths.buf_delete(old_buf, {force = true}) eq(old_win, curwin().id) end) + it('if called from non-floating window in another tabpage', function() + command('tab split') + eq(3, #meths.list_tabpages()) + meths.buf_delete(old_buf, {force = true}) + end) it('if called from floating window with the same buffer', function() meths.set_current_win(same_buf_float) command('autocmd WinLeave * let g:win_leave = nvim_get_current_win()') |