summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/regexp_nfa.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index da80ee9216..cbfed49b59 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -7236,7 +7236,7 @@ theend:
|| (end->lnum == start->lnum && end->col < start->col))
rex.reg_mmatch->endpos[0] = rex.reg_mmatch->startpos[0];
}
- else
+ else if (retval > 0)
{
if (rex.reg_match->endp[0] < rex.reg_match->startp[0])
rex.reg_match->endp[0] = rex.reg_match->startp[0];
diff --git a/src/version.c b/src/version.c
index 6e2e6abc5f..d149c9b3f6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2171,
+/**/
2170,
/**/
2169,