Permalink
Browse files

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".
  • Loading branch information...
brammool committed Apr 18, 2017
1 parent 43d1ac6 commit fc8f1118e7ccd65b0537e47e6323c93a1df6a61a
Showing with 7 additions and 6 deletions.
  1. +5 −6 src/main.c
  2. +2 −0 src/version.c
View
@@ -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 */
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
567,
/**/
566,
/**/

0 comments on commit fc8f111

Please sign in to comment.