thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 8.2.1856: "2resize" uses size of current window

Browse Source 
Problem:    "2resize" uses size of current window.
Solution:   Use size of resized window. (Yasuhiro Matsumoto, closes #7152)
This commit is contained in:
Bram Moolenaar 2020-10-17 17:39:55 +02:00
parent e13bdec6b9
commit 9668cc57a1
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ex_docmd.c
View File

@ -6365,7 +6365,7 @@ ex_resize(exarg_T *eap)
if (cmdmod.split & WSP_VERT) if (cmdmod.split & WSP_VERT)
{ {
if (*eap->arg == '-' || *eap->arg == '+') if (*eap->arg == '-' || *eap->arg == '+')
n += curwin->w_width; n += wp->w_width;
else if (n == 0 && eap->arg[0] == NUL) // default is very wide else if (n == 0 && eap->arg[0] == NUL) // default is very wide
n = 9999; n = 9999;
win_setwidth_win((int)n, wp); win_setwidth_win((int)n, wp);
@ -6373,7 +6373,7 @@ ex_resize(exarg_T *eap)
else else
{ {
if (*eap->arg == '-' || *eap->arg == '+') if (*eap->arg == '-' || *eap->arg == '+')
n += curwin->w_height; n += wp->w_height;
else if (n == 0 && eap->arg[0] == NUL) // default is very high else if (n == 0 && eap->arg[0] == NUL) // default is very high
n = 9999; n = 9999;
win_setheight_win((int)n, wp); win_setheight_win((int)n, wp);

4
src/testdir/test_window_cmd.vim
View File

@ -1144,6 +1144,10 @@ func Test_window_resize()
exe other_winnr .. 'resize 10' exe other_winnr .. 'resize 10'
call assert_equal(10, winheight(other_winnr)) call assert_equal(10, winheight(other_winnr))
call assert_equal(&lines - 10 - 3, winheight(0)) call assert_equal(&lines - 10 - 3, winheight(0))
exe other_winnr .. 'resize +1'
exe other_winnr .. 'resize +1'
call assert_equal(12, winheight(other_winnr))
call assert_equal(&lines - 10 - 3 -2, winheight(0))
%bwipe! %bwipe!
endfunc endfunc

2
src/version.c
View File

@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1856,
/**/ /**/
1855, 1855,
/**/ /**/