patch 9.1.1436: GUI control code is displayed on the console on startup

Problem:  GUI control code is displayed on the console on startup
Solution: check if Vim is starting up (Hirohito Higashi)

closes: #17456

Signed-off-by: Hirohito Higashi <h.east.727@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/version.c b/src/version.c
index 0117df0b68d33b34aaadc83182e06c27b322482a..31f1854d5a0111a06c82f60af50d49a05832e110 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1436,
 /**/
     1435,
 /**/

diff --git a/src/window.c b/src/window.c
index 46e1b63a8ae6553ae03cac06553d580683cbd8fe..bb116382a716568d9b85a77d68f8bae2911951ec 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -6227,7 +6227,7 @@ shell_new_columns(void)
     if (!skip_win_fix_scroll)
        win_fix_scroll(TRUE);
 #ifdef FEAT_GUI
-    if (gui.in_use)
+    if (gui.in_use && !gui.starting)
     {
        if (scroll_region)
            scroll_region_reset();