summaryrefslogtreecommitdiff
path: root/src/match.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/match.c')
-rw-r--r--src/match.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/match.c b/src/match.c
index fb130ae4f..1078424af 100644
--- a/src/match.c
+++ b/src/match.c
@@ -624,10 +624,10 @@ prepare_search_hl(win_T *wp, match_T *search_hl, linenr_T lnum)
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 @@ prepare_search_hl_line(
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 @@ prepare_search_hl_line(
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)