diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-12-16 23:44:02 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-12-16 23:44:02 -0500 |
| commit | b051f33814f95882b5574669ecc50a316a895669 (patch) | |
| tree | dbd89e83de89048f368d42084708647092a650cf | |
| parent | f9647d99b4c663a12dccb3991e0dfcd928e43e73 (diff) | |
| parent | 67f03f33a73344654c799a8e58bb095ff9a13282 (diff) | |
| download | rneovim-b051f33814f95882b5574669ecc50a316a895669.tar.gz rneovim-b051f33814f95882b5574669ecc50a316a895669.tar.bz2 rneovim-b051f33814f95882b5574669ecc50a316a895669.zip | |
Merge pull request #3851 from brcolow/vim-7.4.682
vim-patch:7.4.682
| -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 ed9ae258f9..c4264cbcee 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 9d0f398d61..33c310a8b2 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 |