diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-07-24 02:56:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-24 02:56:18 +0200 |
| commit | 2b473a9df8dc4a6f0129ae3b0f830cdac3864620 (patch) | |
| tree | 1f3153258386fec61320ee6bbbf2793c9cdb55b7 /src/nvim/ex_cmds.c | |
| parent | d011facf456dc85308cf58b6f0c6a06c4ddd7bb2 (diff) | |
| parent | 86f2c473dc0e5b3c886d71b2fee99e1f3c9849b6 (diff) | |
| download | rneovim-2b473a9df8dc4a6f0129ae3b0f830cdac3864620.tar.gz rneovim-2b473a9df8dc4a6f0129ae3b0f830cdac3864620.tar.bz2 rneovim-2b473a9df8dc4a6f0129ae3b0f830cdac3864620.zip | |
Merge #7061 from ckelsel/vim-8.0.0069
Diffstat (limited to 'src/nvim/ex_cmds.c')
| -rw-r--r-- | src/nvim/ex_cmds.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index 0987cb3915..a555fb77e8 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -2802,16 +2802,18 @@ void ex_z(exarg_T *eap) int j; linenr_T lnum = eap->line2; - /* Vi compatible: ":z!" uses display height, without a count uses - * 'scroll' */ - if (eap->forceit) + // Vi compatible: ":z!" uses display height, without a count uses + // 'scroll' + if (eap->forceit) { bigness = curwin->w_height; - else if (firstwin == lastwin) + } else if (ONE_WINDOW) { bigness = curwin->w_p_scr * 2; - else + } else { bigness = curwin->w_height - 3; - if (bigness < 1) + } + if (bigness < 1) { bigness = 1; + } x = eap->arg; kind = x; |