thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 8.0.1360: the Terminal highlighting doesn't work in a terminal

Browse Source 
Problem:    The Terminal highlighting doesn't work in a terminal. (Ozaki
            Kiichi)
Solution:   Use the Terminal highlighting when the cterm index is zero.
This commit is contained in:
Bram Moolenaar 2017-11-30 22:07:07 +01:00
parent 2f0584910c
commit 76bb7196f5
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/terminal.c
View File

@ -1833,6 +1833,23 @@ cell2attr(VTermScreenCellAttrs cellattrs, VTermColor cellfg, VTermColor cellbg)
int fg = color2index(&cellfg, TRUE, &bold); int fg = color2index(&cellfg, TRUE, &bold);
int bg = color2index(&cellbg, FALSE, &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 */ /* with 8 colors set the bold attribute to get a bright foreground */
if (bold == TRUE) if (bold == TRUE)
attr |= HL_BOLD; attr |= HL_BOLD;

2
src/version.c
View File

@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1360,
/**/ /**/
1359, 1359,
/**/ /**/