mirror of
https://github.com/neovim/neovim.git
synced 2024-12-20 11:15:14 -07:00
vim-patch:8.0.0110 (#5700)
Closes #5616
Problem: Drop command doesn't use existing window.
Solution: Check the window width properly. (Hirohito Higashi)
5a030a540f
This commit is contained in:
parent
e29a4ceede
commit
b025474258
@ -4149,12 +4149,10 @@ do_arg_all (
|
||||
wpnext = wp->w_next;
|
||||
buf = wp->w_buffer;
|
||||
if (buf->b_ffname == NULL
|
||||
|| (!keep_tabs && buf->b_nwindows > 1)
|
||||
|| wp->w_width != Columns
|
||||
)
|
||||
|| (!keep_tabs && (buf->b_nwindows > 1 || wp->w_width != Columns))) {
|
||||
i = opened_len;
|
||||
else {
|
||||
/* check if the buffer in this window is in the arglist */
|
||||
} else {
|
||||
// check if the buffer in this window is in the arglist
|
||||
for (i = 0; i < opened_len; ++i) {
|
||||
if (i < alist->al_ga.ga_len
|
||||
&& (AARGLIST(alist)[i].ae_fnum == buf->b_fnum
|
||||
|
@ -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'])
|
||||
tabclose
|
||||
|
||||
if has('gui') || has('clientserver')
|
||||
if has('nvim') || has('gui') || has('clientserver')
|
||||
" Test for ":tab drop exist-file" to keep current window.
|
||||
sp test1
|
||||
tab drop test1
|
||||
@ -64,6 +64,15 @@ function Test_tabpage()
|
||||
call assert_true(tabpagenr() == 2 && tabpagewinnr(2, '$') == 2 && tabpagewinnr(2) == 1)
|
||||
tabclose
|
||||
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
|
||||
"
|
||||
"
|
||||
|
Loading…
Reference in New Issue
Block a user