diff options
| author | brcolow <mike.ennen@gmail.com> | 2015-12-15 23:19:39 -0700 |
|---|---|---|
| committer | Michael Ennen <mike.ennen@gmail.com> | 2015-12-16 13:13:04 -0700 |
| commit | 67f03f33a73344654c799a8e58bb095ff9a13282 (patch) | |
| tree | 3439a36a1063d1ee260dc3678129950eb013638b /src | |
| parent | 1946f96a16be42be3478c76585a25f08babb38df (diff) | |
| download | rneovim-67f03f33a73344654c799a8e58bb095ff9a13282.tar.gz rneovim-67f03f33a73344654c799a8e58bb095ff9a13282.tar.bz2 rneovim-67f03f33a73344654c799a8e58bb095ff9a13282.zip | |
vim-patch:7.4.682
Problem: The search highlighting and match highlighting replaces the
cursorline highlighting, this doesn't look good.
Solution: Combine the highlighting. (Yasuhiro Matsumoto)
https://github.com/vim/vim/commit/09deeb7c945d2677722df5b40959f97b646b6092
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/screen.c | 18 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 9fdb476748..b4cef87434 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -2934,14 +2934,16 @@ win_line ( } } - /* Decide which of the highlight attributes to use. */ - attr_pri = TRUE; - if (area_attr != 0) - char_attr = area_attr; - else if (search_attr != 0) - char_attr = search_attr; - /* Use line_attr when not in the Visual or 'incsearch' area - * (area_attr may be 0 when "noinvcur" is set). */ + // Decide which of the highlight attributes to use. + attr_pri = true; + + if (area_attr != 0) { + char_attr = hl_combine_attr(line_attr, area_attr); + } else if (search_attr != 0) { + char_attr = hl_combine_attr(line_attr, search_attr); + } + // Use line_attr when not in the Visual or 'incsearch' area + // (area_attr may be 0 when "noinvcur" is set). else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) || vcol < fromcol || vcol_prev < fromcol_prev || vcol >= tocol)) diff --git a/src/nvim/version.c b/src/nvim/version.c index 662fcabf17..d3c9f9cd12 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -311,7 +311,7 @@ static int included_patches[] = { // 685, // 684, // 683 NA - // 682, + 682, // 681 NA // 680, // 679 NA |