From 09deeb7c945d2677722df5b40959f97b646b6092 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 24 Mar 2015 18:22:41 +0100
Subject: [PATCH] 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)

---
 src/screen.c  | 13 +++++++++----
 src/version.c |  2 ++
 2 files changed, 11 insertions(+), 4 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;
-	    if (area_attr != 0)
-		char_attr = area_attr;
-	    else if (search_attr != 0)
-		char_attr = search_attr;
 #ifdef LINE_ATTR
+	    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))
 		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
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    682,
 /**/
     681,
 /**/