updated for version 7.4.185

Problem:    Clang gives warnings.
Solution:   Adjust how bigness is set. (Dominique Pelle)

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 70cdd349d8e706fe4abd04c66ef8652315a78cc4..465fb9e436cfda4c360e263664b3ff3b247c1d20 100644 (file)
--- 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 40deff6da5ffeebee3438cdfa44afb4c47ff5e08..221df42388ad2fec4529a2c7e18f6e7687649d4b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    185,
 /**/
     184,
 /**/