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

patch 8.2.1056: wrong display when mixing match conceal and syntax conceal

Browse Source 
Problem:    Wrong display when mixing match conceal and syntax conceal.
Solution:   Adjust how conceal flags are used. (closes #6327, closes #6303)
This commit is contained in:
Bram Moolenaar
2020-06-25 20:07:04 +02:00
parent 73b4465ba7
commit 211dd3fd82
4 changed files with 90 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/highlight.c
View File

@@ -4419,9 +4419,8 @@ update_search_hl(
while (cur != NULL || shl_flag == FALSE)
{
if (shl_flag == FALSE
&& ((cur != NULL
&& cur->priority > SEARCH_HL_PRIORITY)
|| cur == NULL))
&& (cur == NULL
|| cur->priority > SEARCH_HL_PRIORITY))
{
shl = search_hl;
shl_flag = TRUE;
@@ -4453,7 +4452,7 @@ update_search_hl(
*match_conc = cur->conceal_char;
}
else
*has_match_conc = *match_conc = 0;
*has_match_conc = 0;
# endif
}
else if (col == shl->endcol)
@@ -4503,9 +4502,8 @@ update_search_hl(
while (cur != NULL || shl_flag == FALSE)
{
if (shl_flag == FALSE
&& ((cur != NULL
&& cur->priority > SEARCH_HL_PRIORITY)
|| cur == NULL))
&& (cur == NULL ||
cur->priority > SEARCH_HL_PRIORITY))
{
shl = search_hl;
shl_flag = TRUE;