Mercurial > vim

changeset 3770:fdac34e3afa5 v7.3.643

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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().
author Bram Moolenaar <bram@vim.org>
date Wed, 29 Aug 2012 16:26:04 +0200
parents 1c1c077a7393
children 3b0a7ceb7955
files src/term.c src/ui.c src/version.c
diffstat 3 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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();
--- 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
--- 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,