From: Bram Moolenaar Date: Tue, 21 May 2013 20:00:51 +0000 (+0200) Subject: updated for version 7.3.1001 X-Git-Tag: v7.3.1001 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=673af4d3042aef36dcac8b3ab1f62f31d2cd9789;p=thirdparty%2Fvim.git updated for version 7.3.1001 Problem: Duplicate condition in if. Solution: Remove one condition. --- diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c index 9fcba4495f..518da1b76d 100644 --- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -1091,7 +1091,7 @@ nfa_regatom() { nfa_inc(®parse); - if (*regparse == 'n' || *regparse == 'n') + if (*regparse == 'n') startc = reg_string ? NL : NFA_NEWL; else if (*regparse == 'd' diff --git a/src/version.c b/src/version.c index b931535961..eefc21b81f 100644 --- a/src/version.c +++ b/src/version.c @@ -728,6 +728,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1001, /**/ 1000, /**/