Mercurial > vim
diff src/match.c @ 26334:baec4e1cee43 v8.2.3698
patch 8.2.3698: match highlighting continues over breakindent
Commit: https://github.com/vim/vim/commit/0c359af5c0fd106d3f57cc0bb7cef1c89b5e1e10
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Nov 29 19:18:57 2021 +0000
patch 8.2.3698: match highlighting continues over breakindent
Problem: Match highlighting continues over breakindent.
Solution: Stop before the end column. (closes https://github.com/vim/vim/issues/9242)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 29 Nov 2021 20:30:04 +0100 |
| parents | e8e2c4d33b9b |
| children | f1618f8705e4 |
line wrap: on
line diff
--- a/src/match.c +++ b/src/match.c @@ -703,6 +703,8 @@ prepare_search_hl_line( * After end, check for start/end of next match. * When another match, have to check for start again. * Watch out for matching an empty string! + * "on_last_col" is set to TRUE with non-zero search_attr and the next column + * is endcol. * Return the updated search_attr. */ int @@ -715,7 +717,8 @@ update_search_hl( int *has_match_conc UNUSED, int *match_conc UNUSED, int did_line_attr, - int lcs_eol_one) + int lcs_eol_one, + int *on_last_col) { matchitem_T *cur; // points to the match list match_T *shl; // points to search_hl or a match @@ -832,7 +835,10 @@ update_search_hl( else shl = &cur->hl; if (shl->attr_cur != 0) + { search_attr = shl->attr_cur; + *on_last_col = col + 1 >= shl->endcol; + } if (shl != search_hl && cur != NULL) cur = cur->next; }