From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 23 Aug 2012 11:28:55 +0000 (+0200)
Subject: updated for version 7.3.635
X-Git-Tag: v7.3.635
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d93dc2699845009e0f263ed10196309c1175c2e;p=vim

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 d164376d4..b00b7fed7 100644
--- 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 2fbc886e3..5551da4be 100644
--- 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,
 /**/