updated for version 7.3.635

Problem:    Issue 21: System call during startup sets 'lines' to a wrong
            value. (Karl Yngve)
Solution:   Don't set the shell size while the GUI is still starting up.
            (Christian Brabandt)

diff --git a/src/ui.c b/src/ui.c
index d164376d400f3f4420a159f5145d639b0bcaa9a1..b00b7fed7d7c6dc41aca631b6dc560484eefaedb 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -298,6 +298,9 @@ 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 2fbc886e3c56fb7fc9fc3ba9946cf351b9e75cd3..5551da4be9f7513baea304813c4966653ac921d9 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 */
+/**/
+    635,
 /**/
     634,
 /**/