patch 8.0.0629: checking for ambigous width is not working

Problem:    Checking for ambigous width is not working. (Hirohito Higashi)
Solution:   Reset "starting" earlier.

diff --git a/src/main.c b/src/main.c
index 0c7aa98462eb8b541af9b438333d32afb176290f..e30701c6729367578e4c0aea783454e553d712a8 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -792,6 +792,9 @@ vim_main2(void)
     if (params.n_commands > 0)
        exe_commands(&params);
 
+    /* Must come before the may_req_ calls. */
+    starting = 0;
+
 #if defined(FEAT_TERMRESPONSE) && defined(FEAT_MBYTE)
     /* Must be done before redrawing, puts a few characters on the screen. */
     may_req_ambiguous_char_width();
@@ -800,7 +803,6 @@ vim_main2(void)
     RedrawingDisabled = 0;
     redraw_all_later(NOT_VALID);
     no_wait_return = FALSE;
-    starting = 0;
 
     /* 'autochdir' has been postponed */
     DO_AUTOCHDIR

diff --git a/src/version.c b/src/version.c
index 4b98f4457383b5082c11e086a33a3287070689e4..bc6a12daa390af43db69b475151d66ff5191e968 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 */
+/**/
+    629,
 /**/
     628,
 /**/