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)

diff --git a/src/screen.c b/src/screen.c
index c215d4df550e0c759fcd14eb17adc7e08652e8a4..811882870740684f7d6da50b3b3b6c0d22b02259 100644 (file)
--- 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 7ef36073978b18188381efb55daaf3ba640c8209..5c99d497fc6ea8a392eecb25ceed319f71779963 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    682,
 /**/
     681,
 /**/