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 714d1938b8fc9815d354b4194d138daf1cda0cfb..89ab747da25042f8c650144ed18d91fb277c971a 100644 (file)
--- 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 d7355677377e221ae6881ec548b30259446d72b8..e06aa6a62376f73ed5940e12c7195e9d1f5d7169 100644 (file)
--- 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,
 /**/