From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 3 Jul 2013 14:58:44 +0000 (+0200)
Subject: updated for version 7.3.1296
X-Git-Tag: v7.3.1296
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8968a31179c8142cc4ccc2f27cf09e03135c35c7;p=vim

updated for version 7.3.1296
Problem:    Only MS-Windows limits the GUI window size to what fits on the
            monitor.
Solution:   Limit the size for all systems. (Daniel Harding)
---

diff --git a/src/ui.c b/src/ui.c
index 714d1938b..89ab747da 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -326,13 +326,7 @@ ui_set_shellsize(mustset)
 {
 #ifdef FEAT_GUI
     if (gui.in_use)
-	gui_set_shellsize(mustset,
-# ifdef WIN3264
-		TRUE
-# else
-		FALSE
-# endif
-		, RESIZE_BOTH);
+	gui_set_shellsize(mustset, TRUE, RESIZE_BOTH);
     else
 #endif
 	mch_set_shellsize();
diff --git a/src/version.c b/src/version.c
index d73556773..e06aa6a62 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1296,
 /**/
     1295,
 /**/