[vim] 95/139: 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)

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit b2fa54a84078e2b8dc3c7c7bfbccf6b75c0788d0
Author: Bram Moolenaar <Bram at vim.org>
Date:   Fri Apr 22 21:11:09 2016 +0200

    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)
---
 src/term.c    | 13 ++++++-------
 src/version.c |  2 ++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/term.c b/src/term.c
index 059aed7..34549b1 100644
--- a/src/term.c
+++ b/src/term.c
@@ -793,10 +793,8 @@ static struct builtin_term builtin_termcaps[] =
 #  endif
 # endif
 
-# if defined(UNIX) || defined(ALL_BUILTIN_TCAPS) || defined(SOME_BUILTIN_TCAPS) || defined(__EMX__) || defined(FEAT_TERMTRUECOLOR)
-    {(int)KS_NAME,	"xterm"},
-# endif
 # if defined(UNIX) || defined(ALL_BUILTIN_TCAPS) || defined(SOME_BUILTIN_TCAPS) || defined(__EMX__)
+    {(int)KS_NAME,	"xterm"},
     {(int)KS_CE,	IF_EB("\033[K", ESC_STR "[K")},
     {(int)KS_AL,	IF_EB("\033[L", ESC_STR "[L")},
 #  ifdef TERMINFO
@@ -861,6 +859,11 @@ static struct builtin_term builtin_termcaps[] =
     {(int)KS_CRV,	IF_EB("\033[>c", ESC_STR "[>c")},
     {(int)KS_RBG,	IF_EB("\033]11;?\007", ESC_STR "]11;?\007")},
     {(int)KS_U7,	IF_EB("\033[6n", ESC_STR "[6n")},
+#  ifdef FEAT_TERMTRUECOLOR
+    /* These are printf strings, not terminal codes. */
+    {(int)KS_8F,	IF_EB("\033[38;2;%lu;%lu;%lum", ESC_STR "[38;2;%lu;%lu;%lum")},
+    {(int)KS_8B,	IF_EB("\033[48;2;%lu;%lu;%lum", ESC_STR "[48;2;%lu;%lu;%lum")},
+#  endif
 
     {K_UP,		IF_EB("\033O*A", ESC_STR "O*A")},
     {K_DOWN,		IF_EB("\033O*B", ESC_STR "O*B")},
@@ -944,10 +947,6 @@ static struct builtin_term builtin_termcaps[] =
     {TERMCAP2KEY('F', 'Q'), IF_EB("\033[57;*~", ESC_STR "[57;*~")}, /* F36 */
     {TERMCAP2KEY('F', 'R'), IF_EB("\033[58;*~", ESC_STR "[58;*~")}, /* F37 */
 # endif
-# ifdef FEAT_TERMTRUECOLOR
-    {(int)KS_8F,	IF_EB("\033[38;2;%lu;%lu;%lum", ESC_STR "[38;2;%lu;%lu;%lum")},
-    {(int)KS_8B,	IF_EB("\033[48;2;%lu;%lu;%lum", ESC_STR "[48;2;%lu;%lu;%lum")},
-# endif
 
 # if defined(UNIX) || defined(ALL_BUILTIN_TCAPS)
 /*
diff --git a/src/version.c b/src/version.c
index 34b5f4c..9aa400e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1778,
+/**/
     1777,
 /**/
     1776,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git