diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-04-18 18:51:35 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-04-18 18:51:35 +0200 |
| commit | fc8f1118e7ccd65b0537e47e6323c93a1df6a61a (patch) | |
| tree | 6b24e909f77a0121a9a61392fcf09e8166521369 | |
| parent | 43d1ac6e81a6796f2e6b3514bbe029cf9bd0a0ae (diff) | |
| download | vim-git-fc8f1118e7ccd65b0537e47e6323c93a1df6a61a.tar.gz | |
patch 8.0.0567: call for requesting color and ambiwidth is too earlyv8.0.0567
Problem: Call for requesting color and ambiwidth is too early. (Hirohito
Higashi)
Solution: Move the call down to below resetting "starting".
| -rw-r--r-- | src/main.c | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/main.c b/src/main.c index 6d59b09ba..883c9cc23 100644 --- a/src/main.c +++ b/src/main.c @@ -666,12 +666,6 @@ vim_main2(void) starttermcap(); /* start termcap if not done by wait_return() */ TIME_MSG("start termcap"); -#if defined(FEAT_TERMRESPONSE) -# if defined(FEAT_MBYTE) - may_req_ambiguous_char_width(); -# endif - may_req_bg_color(); -#endif #ifdef FEAT_MOUSE setmouse(); /* may start using the mouse */ @@ -801,6 +795,11 @@ vim_main2(void) /* Requesting the termresponse is postponed until here, so that a "-c q" * argument doesn't make it appear in the shell Vim was started from. */ may_req_termresponse(); + +# if defined(FEAT_MBYTE) + may_req_ambiguous_char_width(); +# endif + may_req_bg_color(); #endif /* start in insert mode */ diff --git a/src/version.c b/src/version.c index 50f110a01..487712d06 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 */ /**/ + 567, +/**/ 566, /**/ 565, |