From 6b1da3312e15c065b373c9ec2732f31a77cee61f Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 9 Jun 2017 21:35:47 +0200 Subject: [PATCH] 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 | 4 +++- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main.c b/src/main.c index 0c7aa9846..e30701c67 100644 --- a/src/main.c +++ b/src/main.c @@ -792,6 +792,9 @@ vim_main2(void) if (params.n_commands > 0) exe_commands(¶ms); + /* 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 4b98f4457..bc6a12daa 100644 --- 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, /**/ -- 2.50.1