Mercurial > vim
changeset 11364:0ef92445b4f6 v8.0.0567
patch 8.0.0567: call for requesting color and ambiwidth is too early
commit https://github.com/vim/vim/commit/fc8f1118e7ccd65b0537e47e6323c93a1df6a61a
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Apr 18 18:51:35 2017 +0200
patch 8.0.0567: call for requesting color and ambiwidth is too early
Problem: Call for requesting color and ambiwidth is too early. (Hirohito
Higashi)
Solution: Move the call down to below resetting "starting".
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 18 Apr 2017 19:00:07 +0200 |
| parents | 873acf6f73a7 |
| children | 9b314fd2e99b |
| files | src/main.c src/version.c |
| diffstat | 2 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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 */