updated for version 7.2-065

diff --git a/src/gui.c b/src/gui.c
index b937189f7aa2b498509d949582a9fee04651d64b..bcc3c68bc4bacd02a7fc1f2f860175ba537bfa3b 100644 (file)
--- a/src/gui.c
+++ b/src/gui.c
@@ -3241,7 +3241,7 @@ gui_init_which_components(oldval)
            i = Rows;
            gui_update_tabline();
            Rows = i;
-           need_set_size = RESIZE_VERT;
+           need_set_size |= RESIZE_VERT;
            if (using_tabline)
                fix_size = TRUE;
            if (!gui_use_tabline())
@@ -3275,9 +3275,9 @@ gui_init_which_components(oldval)
                if (gui.which_scrollbars[i] != prev_which_scrollbars[i])
                {
                    if (i == SBAR_BOTTOM)
-                       need_set_size = RESIZE_VERT;
+                       need_set_size |= RESIZE_VERT;
                    else
-                       need_set_size = RESIZE_HOR;
+                       need_set_size |= RESIZE_HOR;
                    if (gui.which_scrollbars[i])
                        fix_size = TRUE;
                }
@@ -3297,7 +3297,7 @@ gui_init_which_components(oldval)
            gui_mch_enable_menu(gui.menu_is_active);
            Rows = i;
            prev_menu_is_active = gui.menu_is_active;
-           need_set_size = RESIZE_VERT;
+           need_set_size |= RESIZE_VERT;
            if (gui.menu_is_active)
                fix_size = TRUE;
        }
@@ -3308,7 +3308,7 @@ gui_init_which_components(oldval)
        {
            gui_mch_show_toolbar(using_toolbar);
            prev_toolbar = using_toolbar;
-           need_set_size = RESIZE_VERT;
+           need_set_size |= RESIZE_VERT;
            if (using_toolbar)
                fix_size = TRUE;
        }
@@ -3318,7 +3318,7 @@ gui_init_which_components(oldval)
        {
            gui_mch_enable_footer(using_footer);
            prev_footer = using_footer;
-           need_set_size = RESIZE_VERT;
+           need_set_size |= RESIZE_VERT;
            if (using_footer)
                fix_size = TRUE;
        }
@@ -3330,10 +3330,11 @@ gui_init_which_components(oldval)
            prev_tearoff = using_tearoff;
        }
 #endif
-       if (need_set_size)
+       if (need_set_size != 0)
        {
 #ifdef FEAT_GUI_GTK
-           long    c = Columns;
+           long    prev_Columns = Columns;
+           long    prev_Rows = Rows;
 #endif
            /* Adjust the size of the window to make the text area keep the
             * same size and to avoid that part of our window is off-screen
@@ -3349,11 +3350,14 @@ gui_init_which_components(oldval)
             * If you remove this, please test this command for resizing
             * effects (with optional left scrollbar): ":vsp|q|vsp|q|vsp|q".
             * Don't do this while starting up though.
-            * And don't change Rows, it may have be reduced intentionally
-            * when adding menu/toolbar/tabline. */
-           if (!gui.starting)
+            * Don't change Rows when adding menu/toolbar/tabline.
+            * Don't change Columns when adding vertical toolbar. */
+           if (!gui.starting && need_set_size != (RESIZE_VERT | RESIZE_HOR))
                (void)char_avail();
-           Columns = c;
+           if ((need_set_size & RESIZE_VERT) == 0)
+               Rows = prev_Rows;
+           if ((need_set_size & RESIZE_HOR) == 0)
+               Columns = prev_Columns;
 #endif
        }
 #ifdef FEAT_WINDOWS

diff --git a/src/version.c b/src/version.c
index d50b80d974f6e6c62bd6ad3fab619ee56669e26a..000aa18ef602e06c7d35cf7e82b40ecc38ace208 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    65,
 /**/
     64,
 /**/