diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-07-28 08:38:08 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-07-28 08:38:08 +0800 |
| commit | 3e0536eb295309c728acca386ec35756b7e034f6 (patch) | |
| tree | f4ef3ef657245cf6d96a3d777ae63c6fda5b11d0 /src/nvim/option.c | |
| parent | 31c018244daa12caab3af357a368279a1f55d28c (diff) | |
| parent | e6d54407ba8ce580fbd81cb9389eb9ce4483597b (diff) | |
| download | rneovim-3e0536eb295309c728acca386ec35756b7e034f6.tar.gz rneovim-3e0536eb295309c728acca386ec35756b7e034f6.tar.bz2 rneovim-3e0536eb295309c728acca386ec35756b7e034f6.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 75b56b4eb4..a6ae022e79 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -4078,7 +4078,7 @@ static char *set_num_option(int opt_idx, char_u *varp, long value, } /* Change window height NOW */ - if (lastwin != firstwin) { + if (!ONE_WINDOW) { if (pp == &p_wh && curwin->w_height < p_wh) win_setheight((int)p_wh); if (pp == &p_hh && curbuf->b_help && curwin->w_height < p_hh) @@ -4107,7 +4107,7 @@ static char *set_num_option(int opt_idx, char_u *varp, long value, } /* Change window width NOW */ - if (lastwin != firstwin && curwin->w_width < p_wiw) + if (!ONE_WINDOW && curwin->w_width < p_wiw) win_setwidth((int)p_wiw); } /* 'winminwidth' */ @@ -5239,7 +5239,7 @@ static int put_setbool(FILE *fd, char *cmd, char *name, int value) void comp_col(void) { - int last_has_status = (p_ls == 2 || (p_ls == 1 && firstwin != lastwin)); + int last_has_status = (p_ls == 2 || (p_ls == 1 && !ONE_WINDOW)); sc_col = 0; ru_col = 0; |