commit 631abc35dfc7ad87255c940fd22eee416c731658
author Bram Moolenaar <Bram@vim.org> Sat Feb 22 22:27:47 2014 +0100
committer Bram Moolenaar <Bram@vim.org> Sat Feb 22 22:27:47 2014 +0100
tree fb054fb549b4dfcffee1c4a9ca2a54fda1853465
parent 9feaf6206f73b367f3167ffff927c1a5d2d90954

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

src/ex_cmds.c

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 70cdd34..465fb9e 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -4099,12 +4099,12 @@
      * '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;
 

src/version.c

diff --git a/src/version.c b/src/version.c
index 40deff6..221df42 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    185,
+/**/
     184,
 /**/
     183,