diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-03-24 18:22:41 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-03-24 18:22:41 +0100 |
| commit | 09deeb7c945d2677722df5b40959f97b646b6092 (patch) | |
| tree | bd3afc23e03d37d0bd76449744fa6aba27937ce8 | |
| parent | dbcf19dc498cb1561c9215a3f255e81cde0c0543 (diff) | |
updated for version 7.4.682v7.4.682
Problem: The search highlighting and match highlighting replaces the
cursorline highlighting, this doesn't look good.
Solution: Combine the highlighting. (Yasuhiro Matsumoto)
| -rw-r--r-- | src/screen.c | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/screen.c b/src/screen.c index c215d4df55..8118828707 100644 --- a/src/screen.c +++ b/src/screen.c @@ -4010,17 +4010,22 @@ win_line(wp, lnum, startrow, endrow, nochange) /* Decide which of the highlight attributes to use. */ attr_pri = TRUE; +#ifdef LINE_ATTR if (area_attr != 0) - char_attr = area_attr; + char_attr = hl_combine_attr(line_attr, area_attr); else if (search_attr != 0) - char_attr = search_attr; -#ifdef LINE_ATTR + 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)) char_attr = line_attr; +#else + if (area_attr != 0) + char_attr = area_attr; + else if (search_attr != 0) + char_attr = search_attr; #endif else { diff --git a/src/version.c b/src/version.c index 7ef3607397..5c99d497fc 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 682, +/**/ 681, /**/ 680, |