IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3851 from brcolow/vim-7.4.682

Browse Source 
vim-patch:7.4.682
This commit is contained in:
Justin M. Keyes 2015-12-16 23:44:02 -05:00
commit b051f33814
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