updated for version 7.2-283

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index ad6fc25e1d865d6e7077ba6f37116715c70b4962..de8f265ec759aa5286acc8d48541dda274948586 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -5267,8 +5267,24 @@ gui_mch_init_font(char_u *font_name, int fontset UNUSED)
 # endif
 #endif /* !HAVE_GTK2 */
 
-    /* Preserve the logical dimensions of the screen. */
-    update_window_manager_hints(0, 0);
+#ifdef HAVE_GTK2
+    if (gui_mch_maximized())
+    {
+       int w, h;
+
+       /* Update lines and columns in accordance with the new font, keep the
+        * window maximized. */
+       gtk_window_get_size(GTK_WINDOW(gui.mainwin), &w, &h);
+       w -= get_menu_tool_width();
+       h -= get_menu_tool_height();
+       gui_resize_shell(w, h);
+    }
+    else
+#endif
+    {
+       /* Preserve the logical dimensions of the screen. */
+       update_window_manager_hints(0, 0);
+    }
 
     return OK;
 }

diff --git a/src/version.c b/src/version.c
index c50d15ccfc477b26be998fd03c55143b30fb64d2..83af0958b3f277fb147fee35370ec627f6b81b1f 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 */
+/**/
+    283,
 /**/
     282,
 /**/