diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-06-25 20:07:04 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-06-25 20:07:04 +0200 |
| commit | 211dd3fd82216ca879fe7f917ea345b3ae366ce1 (patch) | |
| tree | 21bd8158c75ac29a1a58cb6ec024ed8ace365464 /src/highlight.c | |
| parent | 73b4465ba7f170c5a1701ad908144970e758b1f5 (diff) | |
| download | vim-git-211dd3fd82216ca879fe7f917ea345b3ae366ce1.tar.gz | |
patch 8.2.1056: wrong display when mixing match conceal and syntax concealv8.2.1056
Problem: Wrong display when mixing match conceal and syntax conceal.
Solution: Adjust how conceal flags are used. (closes #6327, closes #6303)
Diffstat (limited to 'src/highlight.c')
| -rw-r--r-- | src/highlight.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/highlight.c b/src/highlight.c index dacce5c49..8c41c38fc 100644 --- a/src/highlight.c +++ b/src/highlight.c @@ -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; |