diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-02-22 22:27:47 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-02-22 22:27:47 +0100 |
| commit | 631abc35dfc7ad87255c940fd22eee416c731658 (patch) | |
| tree | fb054fb549b4dfcffee1c4a9ca2a54fda1853465 | |
| parent | 9feaf6206f73b367f3167ffff927c1a5d2d90954 (diff) | |
updated for version 7.4.185v7.4.185
Problem: Clang gives warnings.
Solution: Adjust how bigness is set. (Dominique Pelle)
| -rw-r--r-- | src/ex_cmds.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 70cdd349d8..465fb9e436 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -4099,12 +4099,12 @@ ex_z(eap) * 'scroll' */ if (eap->forceit) bigness = curwin->w_height; - else if (firstwin == lastwin) - bigness = curwin->w_p_scr * 2; #ifdef FEAT_WINDOWS - else + else if (firstwin != lastwin) bigness = curwin->w_height - 3; #endif + else + bigness = curwin->w_p_scr * 2; if (bigness < 1) bigness = 1; diff --git a/src/version.c b/src/version.c index 40deff6da5..221df42388 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 185, +/**/ 184, /**/ 183, |