Skip to content

Commit fc8f111

Browse files
committed
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".
1 parent 43d1ac6 commit fc8f111

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/main.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -666,12 +666,6 @@ vim_main2(void)
666666

667667
starttermcap(); /* start termcap if not done by wait_return() */
668668
TIME_MSG("start termcap");
669-
#if defined(FEAT_TERMRESPONSE)
670-
# if defined(FEAT_MBYTE)
671-
may_req_ambiguous_char_width();
672-
# endif
673-
may_req_bg_color();
674-
#endif
675669

676670
#ifdef FEAT_MOUSE
677671
setmouse(); /* may start using the mouse */
@@ -801,6 +795,11 @@ vim_main2(void)
801795
/* Requesting the termresponse is postponed until here, so that a "-c q"
802796
* argument doesn't make it appear in the shell Vim was started from. */
803797
may_req_termresponse();
798+
799+
# if defined(FEAT_MBYTE)
800+
may_req_ambiguous_char_width();
801+
# endif
802+
may_req_bg_color();
804803
#endif
805804

806805
/* start in insert mode */

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
567,
767769
/**/
768770
566,
769771
/**/

0 commit comments

Comments
 (0)