patch 8.1.1097: Motif build fails

Problem:    Motif build fails. (Paul Jolly)
Solution:   Only use gui_mch_maximized() for MS-Windows. (closes #4194)

diff --git a/src/gui.c b/src/gui.c
index 70170666db0f860404de7fb996b7dc17dbcd3d27..0e2686d66e7acfa3430a8cccfebd7e513fe56ddf 100644 (file)
--- a/src/gui.c
+++ b/src/gui.c
@@ -678,7 +678,7 @@ gui_init(void)
     /* All components of the GUI have been created now */
     gui.shell_created = TRUE;
 
-#ifndef FEAT_GUI_GTK
+#ifdef FEAT_GUI_MSWIN
     // Set the shell size, adjusted for the screen size.  For GTK this only
     // works after the shell has been opened, thus it is further down.
     // If the window is already maximized (e.g. when --windowid is passed in),
@@ -688,6 +688,10 @@ gui_init(void)
        gui_set_shellsize(FALSE, TRUE, RESIZE_BOTH);
     else
        gui_set_shellsize(TRUE, TRUE, RESIZE_BOTH);
+#else
+# ifndef FEAT_GUI_GTK
+    gui_set_shellsize(FALSE, TRUE, RESIZE_BOTH);
+# endif
 #endif
 #if defined(FEAT_GUI_MOTIF) && defined(FEAT_MENU)
     /* Need to set the size of the menubar after all the menus have been

diff --git a/src/version.c b/src/version.c
index 792afeada2cbdee172d0432f113ff899da45bdb9..846b816b10c1609fe8c82a75b8b39d8c98feb207 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1097,
 /**/
     1096,
 /**/