# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1427217761 -3600
# Node ID f242cf1f98975b4840e5f4644c3c3e84d08d96eb
# Parent  f202e335d4912560223dcbca085aa146c26f3a69
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
--- 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
 	    {
diff --git a/src/version.c b/src/version.c
--- 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,