commit 6b1da3312e15c065b373c9ec2732f31a77cee61f
author Bram Moolenaar <Bram@vim.org> Fri Jun 09 21:35:47 2017 +0200
committer Bram Moolenaar <Bram@vim.org> Fri Jun 09 21:35:47 2017 +0200
tree 41a4569401bfda33f2a175f24f9bc3e264767271
parent f085f4266e07b36279c56d43fd0d73ed080046ae

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.

src/main.c

diff --git a/src/main.c b/src/main.c
index 0c7aa98..e30701c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -792,6 +792,9 @@
     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 @@
     RedrawingDisabled = 0;
     redraw_all_later(NOT_VALID);
     no_wait_return = FALSE;
-    starting = 0;
 
     /* 'autochdir' has been postponed */
     DO_AUTOCHDIR

src/version.c

diff --git a/src/version.c b/src/version.c
index 4b98f44..bc6a12d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    629,
+/**/
     628,
 /**/
     627,