diff --git a/src/match.c b/src/match.c
index fb130ae..1078424 100644
--- a/src/match.c
+++ b/src/match.c
@@ -624,10 +624,10 @@
     static void
 check_cur_search_hl(win_T *wp, match_T *shl)
 {
-    long linecount = shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum;
+    linenr_T linecount = shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum;
 
     if (wp->w_cursor.lnum >= shl->lnum
-	    && wp->w_cursor.lnum <= shl->lnum + shl->rm.endpos[0].lnum
+	    && wp->w_cursor.lnum <= shl->lnum + linecount
 	    && (wp->w_cursor.lnum > shl->lnum
 				|| wp->w_cursor.col >= shl->rm.startpos[0].col)
 	    && (wp->w_cursor.lnum < shl->lnum + linecount
@@ -673,7 +673,6 @@
 	    shl = &cur->hl;
 	shl->startcol = MAXCOL;
 	shl->endcol = MAXCOL;
-	shl->lines = 0;
 	shl->attr_cur = 0;
 	shl->is_addpos = FALSE;
 	shl->has_cursor = FALSE;
@@ -697,9 +696,6 @@
 		shl->endcol = shl->rm.endpos[0].col;
 	    else
 		shl->endcol = MAXCOL;
-	    shl->lines = shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum;
-	    if (shl->lines == 0)
-		shl->lines = 1;
 
 	    // check if the cursor is in the match before changing the columns
 	    if (shl == search_hl)