From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 22 Feb 2014 21:27:47 +0000 (+0100)
Subject: updated for version 7.4.185
X-Git-Tag: v7.4.185
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=631abc35dfc7ad87255c940fd22eee416c731658;p=vim

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 70cdd349d..465fb9e43 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 40deff6da..221df4238 100644
--- 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,
 /**/