Mercurial > vim

changeset 5678:b06e58f8dd30 v7.4.185

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.185 Problem: Clang gives warnings. Solution: Adjust how bigness is set. (Dominique Pelle)
author Bram Moolenaar <bram@vim.org>
date Sat, 22 Feb 2014 22:27:47 +0100
parents 093067af7c6c
children 5fdabe005490
files src/ex_cmds.c src/version.c
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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)
+#ifdef FEAT_WINDOWS
+    else if (firstwin != lastwin)
+	bigness = curwin->w_height - 3;
+#endif
+    else
 	bigness = curwin->w_p_scr * 2;
-#ifdef FEAT_WINDOWS
-    else
-	bigness = curwin->w_height - 3;
-#endif
     if (bigness < 1)
 	bigness = 1;
 
--- 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,