From ab62c19ea034d76632bbbf4265a9fc17e7508541 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 30 Mar 2019 16:39:05 +0100 Subject: [PATCH] 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 #4073) --- src/screen.c | 12 ++++++++---- src/version.c | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/screen.c b/src/screen.c index c3cc8cdfa..455c335aa 100644 --- a/src/screen.c +++ b/src/screen.c @@ -4133,8 +4133,12 @@ win_line( shl->endcol = tmp_col; shl->attr_cur = shl->attr; #ifdef FEAT_CONCEAL - 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; @@ -5175,8 +5179,8 @@ win_line( #ifdef FEAT_CONCEAL if ( wp->w_p_cole > 0 && (wp != curwin || lnum != wp->w_cursor.lnum || - conceal_cursor_line(wp) ) - && ( (syntax_flags & HL_CONCEAL) != 0 || has_match_conc > 0) + conceal_cursor_line(wp)) + && ((syntax_flags & HL_CONCEAL) != 0 || has_match_conc > 0) && !(lnum_in_visual_area && vim_strchr(wp->w_p_cocu, 'v') == NULL)) { diff --git a/src/version.c b/src/version.c index fad51e22b..98f09b3fb 100644 --- a/src/version.c +++ b/src/version.c @@ -775,6 +775,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1082, /**/ 1081, /**/ -- 2.40.0