patch 8.0.0567: call for requesting color and ambiwidth is too early

Problem:    Call for requesting color and ambiwidth is too early. (Hirohito
            Higashi)
Solution:   Move the call down to below resetting "starting".

diff --git a/src/main.c b/src/main.c
index 6d59b09ba4a66bdefdfa8424c07e19a070f73591..883c9cc23ee74448432a05f20c253159bec5b109 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -666,12 +666,6 @@ vim_main2(void)
 
     starttermcap();        /* start termcap if not done by wait_return() */
     TIME_MSG("start termcap");
-#if defined(FEAT_TERMRESPONSE)
-# if defined(FEAT_MBYTE)
-    may_req_ambiguous_char_width();
-# endif
-    may_req_bg_color();
-#endif
 
 #ifdef FEAT_MOUSE
     setmouse();                                /* may start using the mouse */
@@ -801,6 +795,11 @@ vim_main2(void)
     /* Requesting the termresponse is postponed until here, so that a "-c q"
      * argument doesn't make it appear in the shell Vim was started from. */
     may_req_termresponse();
+
+# if defined(FEAT_MBYTE)
+    may_req_ambiguous_char_width();
+# endif
+    may_req_bg_color();
 #endif
 
     /* start in insert mode */

diff --git a/src/version.c b/src/version.c
index 50f110a0178cbc9538ac6296857e6fa658c7e9a4..487712d069401a1394a374aa8c0104af55198d8f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    567,
 /**/
     566,
 /**/