diff options
author | ckelsel <ckelsel@hotmail.com> | 2017-07-23 11:11:56 +0800 |
---|---|---|
committer | ckelsel <ckelsel@hotmail.com> | 2017-07-23 11:25:39 +0800 |
commit | b656159fcfded40839c222ae1c4e86873c82f295 (patch) | |
tree | 5bb84eb717a6ebcdc828034fa2b10e2ec28086a8 /src/nvim/option.c | |
parent | ad07e9c7fcabeb991f0849c9e11b5b225cf470fd (diff) | |
download | rneovim-b656159fcfded40839c222ae1c4e86873c82f295.tar.gz rneovim-b656159fcfded40839c222ae1c4e86873c82f295.tar.bz2 rneovim-b656159fcfded40839c222ae1c4e86873c82f295.zip |
vim-patch:8.0.0073
Problem: More comparisons between firstwin and lastwin.
Solution: Use ONE_WINDOW for consistency. (Hirohito Higashi)
https://github.com/vim/vim/commit/459ca563128f2edb7e3bb190090bbb755a56dd55
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; |