To: vim_dev@googlegroups.com
Subject: Patch 7.4.1778
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

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)
Files:      src/term.c


*** ../vim-7.4.1777/src/term.c	2016-04-22 20:20:13.004866307 +0200
--- src/term.c	2016-04-22 21:08:43.746311313 +0200
***************
*** 793,802 ****
  #  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_CE,	IF_EB("\033[K", ESC_STR "[K")},
      {(int)KS_AL,	IF_EB("\033[L", ESC_STR "[L")},
  #  ifdef TERMINFO
--- 793,800 ----
  #  endif
  # 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,866 ****
--- 859,869 ----
      {(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,953 ****
      {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)
  /*
--- 947,952 ----
*** ../vim-7.4.1777/src/version.c	2016-04-22 20:46:42.988145173 +0200
--- src/version.c	2016-04-22 21:10:23.893262761 +0200
***************
*** 755,756 ****
--- 755,758 ----
  {   /* Add new patch number below this line */
+ /**/
+     1778,
  /**/

-- 
    With sufficient thrust, pigs fly just fine.
                   -- RFC 1925

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///