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

Patch 8.0.1360
Problem:    The Terminal highlighting doesn't work in a terminal. (Ozaki
            Kiichi)
Solution:   Use the Terminal highlighting when the cterm index is zero.
Files:      src/terminal.c


*** ../vim-8.0.1359/src/terminal.c	2017-11-29 22:33:31.051416026 +0100
--- src/terminal.c	2017-11-30 22:02:48.664984317 +0100
***************
*** 1833,1838 ****
--- 1833,1855 ----
  	int fg = color2index(&cellfg, TRUE, &bold);
  	int bg = color2index(&cellbg, FALSE, &bold);
  
+ 	/* Use the "Terminal" highlighting for the default colors. */
+ 	if (fg == 0 || bg == 0)
+ 	{
+ 	    int id = syn_name2id((char_u *)"Terminal");
+ 
+ 	    if (id != 0 && t_colors >= 16)
+ 	    {
+ 		int cterm_fg, cterm_bg;
+ 
+ 		syn_id2cterm_bg(id, &cterm_fg, &cterm_bg);
+ 		if (cterm_fg >= 0)
+ 		    fg = cterm_fg + 1;
+ 		if (cterm_bg >= 0)
+ 		    bg = cterm_bg + 1;
+ 	    }
+ 	}
+ 
  	/* with 8 colors set the bold attribute to get a bright foreground */
  	if (bold == TRUE)
  	    attr |= HL_BOLD;
*** ../vim-8.0.1359/src/version.c	2017-11-29 22:33:31.055416004 +0100
--- src/version.c	2017-11-30 22:05:18.684445024 +0100
***************
*** 773,774 ****
--- 773,776 ----
  {   /* Add new patch number below this line */
+ /**/
+     1360,
  /**/

-- 
Creating the world with Emacs:   M-x let-there-be-light
Creating the world with Vim:     :make world

 /// 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    ///