vim-patch:8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.

Problem:    "Conceal" match is mixed up with 'hlsearch' match.
Solution:   Check that a match is found, not a 'hlsearch' item. (Andy
            Massimino, closes vim/vim#4073)
ab62c19ea0
This commit is contained in:
Jan Edmund Lazo 2019-03-31 12:25:41 -04:00
parent be762a1b6f
commit 3ae3d80bfb

View File

@ -2963,8 +2963,11 @@ win_line (
shl->endcol = tmp_col; shl->endcol = tmp_col;
} }
shl->attr_cur = shl->attr; shl->attr_cur = shl->attr;
if (cur != NULL && syn_name2id((char_u *)"Conceal") // Match with the "Conceal" group results in hiding
== cur->hlg_id) { // the match.
if (cur != NULL
&& shl != &search_hl
&& syn_name2id((char_u *)"Conceal") == cur->hlg_id) {
has_match_conc = v == (long)shl->startcol ? 2 : 1; has_match_conc = v == (long)shl->startcol ? 2 : 1;
match_conc = cur->conceal_char; match_conc = cur->conceal_char;
} else { } else {