patch 8.0.1360: the Terminal highlighting doesn't work in a terminalv8.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.

1 files changed, 17 insertions, 0 deletions

diff --git a/src/terminal.c b/src/terminal.c
index 2c3197473..a2858a2b0 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -1833,6 +1833,23 @@ cell2attr(VTermScreenCellAttrs cellattrs, VTermColor cellfg, VTermColor cellbg)
 	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;