diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-03-31 12:25:41 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-03-31 12:40:54 -0400 |
| commit | 3ae3d80bfb405b6e5a0189a5d93fcc9865c37580 (patch) | |
| tree | 04f574f0c81c95577782ab6087081c5d545eb1f7 /src | |
| parent | be762a1b6f63c574b1090e4aad9044fb41533330 (diff) | |
| download | rneovim-3ae3d80bfb405b6e5a0189a5d93fcc9865c37580.tar.gz rneovim-3ae3d80bfb405b6e5a0189a5d93fcc9865c37580.tar.bz2 rneovim-3ae3d80bfb405b6e5a0189a5d93fcc9865c37580.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/screen.c | 7 |
1 files changed, 5 insertions, 2 deletions
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 { |