kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-01-01 17:23:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.682

Browse Source 
Problem: The search highlighting and match highlighting replaces the
cursorline highlighting, this doesn't look good.
Solution: Combine the highlighting. (Yasuhiro Matsumoto)

09deeb7c94
This commit is contained in:
brcolow 2015-12-15 23:19:39 -07:00 committed by Michael Ennen
parent 1946f96a16
commit 67f03f33a7
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/nvim/screen.c
View File

@ -2934,14 +2934,16 @@ win_line (
} }
} }
/* Decide which of the highlight attributes to use. */ // Decide which of the highlight attributes to use.
attr_pri = TRUE; attr_pri = true;
if (area_attr != 0)
char_attr = area_attr; if (area_attr != 0) {
else if (search_attr != 0) char_attr = hl_combine_attr(line_attr, area_attr);
char_attr = search_attr; } else if (search_attr != 0) {
/* Use line_attr when not in the Visual or 'incsearch' area char_attr = hl_combine_attr(line_attr, search_attr);
* (area_attr may be 0 when "noinvcur" is set). */ }
// 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) else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL)
|| vcol < fromcol || vcol_prev < fromcol_prev || vcol < fromcol || vcol_prev < fromcol_prev
|| vcol >= tocol)) || vcol >= tocol))

2
src/nvim/version.c
View File

@ -311,7 +311,7 @@ static int included_patches[] = {
// 685, // 685,
// 684, // 684,
// 683 NA // 683 NA
// 682, 682,
// 681 NA // 681 NA
// 680, // 680,
// 679 NA // 679 NA