Skip to content

Commit b2fa54a

Browse files
committed
patch 7.4.1778
Problem: When using the term truecolor feature, the t_8f and t_8b termcap options are not set by default. Solution: Move the values to before BT_EXTRA_KEYS. (Christian Brabandt)
1 parent 3849992 commit b2fa54a

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

src/term.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -793,10 +793,8 @@ static struct builtin_term builtin_termcaps[] =
793793
# endif
794794
# endif
795795

796-
# if defined(UNIX) || defined(ALL_BUILTIN_TCAPS) || defined(SOME_BUILTIN_TCAPS) || defined(__EMX__) || defined(FEAT_TERMTRUECOLOR)
797-
{(int)KS_NAME, "xterm"},
798-
# endif
799796
# if defined(UNIX) || defined(ALL_BUILTIN_TCAPS) || defined(SOME_BUILTIN_TCAPS) || defined(__EMX__)
797+
{(int)KS_NAME, "xterm"},
800798
{(int)KS_CE, IF_EB("\033[K", ESC_STR "[K")},
801799
{(int)KS_AL, IF_EB("\033[L", ESC_STR "[L")},
802800
# ifdef TERMINFO
@@ -861,6 +859,11 @@ static struct builtin_term builtin_termcaps[] =
861859
{(int)KS_CRV, IF_EB("\033[>c", ESC_STR "[>c")},
862860
{(int)KS_RBG, IF_EB("\033]11;?\007", ESC_STR "]11;?\007")},
863861
{(int)KS_U7, IF_EB("\033[6n", ESC_STR "[6n")},
862+
# ifdef FEAT_TERMTRUECOLOR
863+
/* These are printf strings, not terminal codes. */
864+
{(int)KS_8F, IF_EB("\033[38;2;%lu;%lu;%lum", ESC_STR "[38;2;%lu;%lu;%lum")},
865+
{(int)KS_8B, IF_EB("\033[48;2;%lu;%lu;%lum", ESC_STR "[48;2;%lu;%lu;%lum")},
866+
# endif
864867

865868
{K_UP, IF_EB("\033O*A", ESC_STR "O*A")},
866869
{K_DOWN, IF_EB("\033O*B", ESC_STR "O*B")},
@@ -944,10 +947,6 @@ static struct builtin_term builtin_termcaps[] =
944947
{TERMCAP2KEY('F', 'Q'), IF_EB("\033[57;*~", ESC_STR "[57;*~")}, /* F36 */
945948
{TERMCAP2KEY('F', 'R'), IF_EB("\033[58;*~", ESC_STR "[58;*~")}, /* F37 */
946949
# endif
947-
# ifdef FEAT_TERMTRUECOLOR
948-
{(int)KS_8F, IF_EB("\033[38;2;%lu;%lu;%lum", ESC_STR "[38;2;%lu;%lu;%lum")},
949-
{(int)KS_8B, IF_EB("\033[48;2;%lu;%lu;%lum", ESC_STR "[48;2;%lu;%lu;%lum")},
950-
# endif
951950

952951
# if defined(UNIX) || defined(ALL_BUILTIN_TCAPS)
953952
/*

src/version.c

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

754754
static int included_patches[] =
755755
{ /* Add new patch number below this line */
756+
/**/
757+
1778,
756758
/**/
757759
1777,
758760
/**/

0 commit comments

Comments
 (0)