thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 8.0.0567: call for requesting color and ambiwidth is too early

Browse Source 
Problem:    Call for requesting color and ambiwidth is too early. (Hirohito
            Higashi)
Solution:   Move the call down to below resetting "starting".
This commit is contained in:
Bram Moolenaar 2017-04-18 18:51:35 +02:00
parent 43d1ac6e81
commit fc8f1118e7
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.c
View File

@ -666,12 +666,6 @@ vim_main2(void)
starttermcap(); /* start termcap if not done by wait_return() */ starttermcap(); /* start termcap if not done by wait_return() */
TIME_MSG("start termcap"); 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 #ifdef FEAT_MOUSE
setmouse(); /* may start using the 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" /* 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. */ * argument doesn't make it appear in the shell Vim was started from. */
may_req_termresponse(); may_req_termresponse();
# if defined(FEAT_MBYTE)
may_req_ambiguous_char_width();
# endif
may_req_bg_color();
#endif #endif
/* start in insert mode */ /* start in insert mode */

2
src/version.c
View File

@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
567,
/**/ /**/
566, 566,
/**/ /**/