updated for version 7.3.643v7.3.643v7-3-643

Problem:    MS-Windows: When starting gvim maximized 'lines' and 'columns' are
	    wrong. (Christian Robinson)
Solution:   Move the check for gui.starting from ui_get_shellsize() to
	    check_shellsize().

3 files changed, 9 insertions, 4 deletions

diff --git a/src/term.c b/src/term.c
index 0a296fc9..38fc89b6 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3006,7 +3006,13 @@ shell_resized_check()
     int		old_Rows = Rows;
     int		old_Columns = Columns;
 
-    if (!exiting)
+    if (!exiting
+#ifdef FEAT_GUI
+	    /* Do not get the size when executing a shell command during
+	     * startup. */
+	    && !gui.starting
+#endif
+	    )
     {
 	(void)ui_get_shellsize();
 	check_shellsize();
diff --git a/src/ui.c b/src/ui.c
index b00b7fed..d164376d 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -298,9 +298,6 @@ ui_get_shellsize()
     int	    retval;
 
 #ifdef FEAT_GUI
-    if (gui.starting)
-	/* possibly a system call during startup, check later */
-	return OK;
     if (gui.in_use)
 	retval = gui_get_shellsize();
     else
diff --git a/src/version.c b/src/version.c
index 767c4c0d..078d8750 100644
--- a/src/version.c
+++ b/src/version.c
@@ -720,6 +720,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    643,
+/**/
     642,
 /**/
     641,