Skip to content

Commit ff79197

Browse files
committed
updated for version 7.3.829
Problem: When compiled with the +rightleft feature 'showmatch' also shows a match for the opening paren. When 'revins' is set the screen may scroll. Solution: Only check the opening paren when the +rightleft feature was enabled. Do not show a match that is not visible. (partly by Christian Brabandt)
1 parent cc49f70 commit ff79197

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/search.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2431,12 +2431,10 @@ showmatch(c)
24312431
/* 'matchpairs' is "x:y,x:y" */
24322432
for (p = curbuf->b_p_mps; *p != NUL; ++p)
24332433
{
2434-
if (PTR2CHAR(p) == c
24352434
#ifdef FEAT_RIGHTLEFT
2436-
&& (curwin->w_p_rl ^ p_ri)
2437-
#endif
2438-
)
2435+
if (PTR2CHAR(p) == c && (curwin->w_p_rl ^ p_ri))
24392436
break;
2437+
#endif
24402438
p += MB_PTR2LEN(p) + 1;
24412439
if (PTR2CHAR(p) == c
24422440
#ifdef FEAT_RIGHTLEFT
@@ -2451,7 +2449,7 @@ showmatch(c)
24512449

24522450
if ((lpos = findmatch(NULL, NUL)) == NULL) /* no match, so beep */
24532451
vim_beep();
2454-
else if (lpos->lnum >= curwin->w_topline)
2452+
else if (lpos->lnum >= curwin->w_topline && lpos->lnum < curwin->w_botline)
24552453
{
24562454
if (!curwin->w_p_wrap)
24572455
getvcol(curwin, lpos, NULL, &vcol, NULL);

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -728,6 +728,8 @@ static char *(features[]) =
728728

729729
static int included_patches[] =
730730
{ /* Add new patch number below this line */
731+
/**/
732+
829,
731733
/**/
732734
828,
733735
/**/

0 commit comments

Comments
 (0)