Mercurial > vim
diff src/screen.c @ 6717:f242cf1f9897 v7.4.682
updated for version 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)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Tue, 24 Mar 2015 18:22:41 +0100 |
| parents | 8faab3792a92 |
| children | a8962f0e0d34 |
line wrap: on
line diff
--- a/src/screen.c +++ b/src/screen.c @@ -4010,17 +4010,22 @@ win_line(wp, lnum, startrow, endrow, noc /* 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 {