mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 19:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.0.0110 (#5700)

Browse Source 
Closes #5616

Problem:    Drop command doesn't use existing window.
Solution:   Check the window width properly. (Hirohito Higashi)

5a030a540f
This commit is contained in:
Justin M. Keyes
2016-12-03 22:38:13 +01:00
committed by GitHub
parent e29a4ceede
commit b025474258
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/buffer.c
View File

@@ -4149,12 +4149,10 @@ do_arg_all (
wpnext = wp->w_next; wpnext = wp->w_next;
buf = wp->w_buffer; buf = wp->w_buffer;
if (buf->b_ffname == NULL if (buf->b_ffname == NULL
|| (!keep_tabs && buf->b_nwindows > 1) || (!keep_tabs && (buf->b_nwindows > 1 || wp->w_width != Columns))) {
|| wp->w_width != Columns
)
i = opened_len; i = opened_len;
else { } else {
/* check if the buffer in this window is in the arglist */ // check if the buffer in this window is in the arglist
for (i = 0; i < opened_len; ++i) { for (i = 0; i < opened_len; ++i) {
if (i < alist->al_ga.ga_len if (i < alist->al_ga.ga_len
&& (AARGLIST(alist)[i].ae_fnum == buf->b_fnum && (AARGLIST(alist)[i].ae_fnum == buf->b_fnum

11
src/nvim/testdir/test_tabpage.vim
View File

@@ -40,7 +40,7 @@ function Test_tabpage()
call assert_true(t:val_num == 100 && t:val_str == 'SetTabVar test' && t:val_list == ['red', 'blue', 'green']) call assert_true(t:val_num == 100 && t:val_str == 'SetTabVar test' && t:val_list == ['red', 'blue', 'green'])
tabclose tabclose
if has('gui') || has('clientserver') if has('nvim') || has('gui') || has('clientserver')
" Test for ":tab drop exist-file" to keep current window. " Test for ":tab drop exist-file" to keep current window.
sp test1 sp test1
tab drop test1 tab drop test1
@@ -64,6 +64,15 @@ function Test_tabpage()
call assert_true(tabpagenr() == 2 && tabpagewinnr(2, '$') == 2 && tabpagewinnr(2) == 1) call assert_true(tabpagenr() == 2 && tabpagewinnr(2, '$') == 2 && tabpagewinnr(2) == 1)
tabclose tabclose
q q
"
"
" Test for ":tab drop vertical-split-window" to jump test1 buffer
tabedit test1
vnew
tabfirst
tab drop test1
call assert_equal([2, 2, 2, 2], [tabpagenr('$'), tabpagenr(), tabpagewinnr(2, '$'), tabpagewinnr(2)])
1tabonly
endif endif
" "
" "