diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-06-09 21:35:47 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-06-09 21:35:47 +0200 |
| commit | 6b1da3312e15c065b373c9ec2732f31a77cee61f (patch) | |
| tree | 41a4569401bfda33f2a175f24f9bc3e264767271 | |
| parent | f085f4266e07b36279c56d43fd0d73ed080046ae (diff) | |
| download | vim-git-6b1da3312e15c065b373c9ec2732f31a77cee61f.tar.gz | |
patch 8.0.0629: checking for ambigous width is not workingv8.0.0629
Problem: Checking for ambigous width is not working. (Hirohito Higashi)
Solution: Reset "starting" earlier.
| -rw-r--r-- | src/main.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
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 @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 629, +/**/ 628, /**/ 627, |