updated for version 7.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().

diff --git a/src/term.c b/src/term.c
index 0a296fc91c4b4a0ea1fe3c209cc32db013e37e01..38fc89b699cc9799d26304cac0545320b42664f2 100644 (file)
--- 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 b00b7fed7d7c6dc41aca631b6dc560484eefaedb..d164376d400f3f4420a159f5145d639b0bcaa9a1 100644 (file)
--- 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 767c4c0d3a3bb772a80641ab947eb581d8ebcb5b..078d87509949eecdd7274e19a89058d1ffc8ad5f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    643,
 /**/
     642,
 /**/