diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-07-31 02:05:02 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-07-31 02:05:02 +0300 |
| commit | fbe60af538aa6c723779ae7a816de845460619ae (patch) | |
| tree | b541ffeeaa5046de170cac688c72aeb891c61ebb /src/nvim/ex_cmds.c | |
| parent | 1011462b40502e6039494e70a870f0360f152b1b (diff) | |
| parent | 13e8356f52d9dc1da96179ee425168740874c8c7 (diff) | |
| download | rneovim-fbe60af538aa6c723779ae7a816de845460619ae.tar.gz rneovim-fbe60af538aa6c723779ae7a816de845460619ae.tar.bz2 rneovim-fbe60af538aa6c723779ae7a816de845460619ae.zip | |
Merge branch 'master' into colored-cmdline
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; |