# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1497037504 -7200
# Node ID 5ccf1b2222236679abb128e46c959ec8b0da3556
# Parent  c7334ea3b49244f77df57c23ba0fd3512ac8e5b8
patch 8.0.0629: checking for ambigous width is not working

commit https://github.com/vim/vim/commit/6b1da3312e15c065b373c9ec2732f31a77cee61f
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Jun 9 21:35:47 2017 +0200

    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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    629,
+/**/
     628,
 /**/
     627,