From 3ae3d80bfb405b6e5a0189a5d93fcc9865c37580 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sun, 31 Mar 2019 12:25:41 -0400 Subject: 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) https://github.com/vim/vim/commit/ab62c19ea034d76632bbbf4265a9fc17e7508541 --- src/nvim/screen.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/nvim/screen.c b/src/nvim/screen.c index fd070c6653..e66425d0c1 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -2963,8 +2963,11 @@ win_line ( shl->endcol = tmp_col; } shl->attr_cur = shl->attr; - if (cur != NULL && syn_name2id((char_u *)"Conceal") - == cur->hlg_id) { + // Match with the "Conceal" group results in hiding + // 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; match_conc = cur->conceal_char; } else { -- cgit