summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-05-21 22:00:51 +0200
committerBram Moolenaar <bram@vim.org>2013-05-21 22:00:51 +0200
commit45b9961e2d3448a22991a928684160fdaa2c2b59 (patch)
treeaeb4c6be9a5e6666a3f756492daecc40f42e798d
parent2b898d131bb52b4f4c5ea21ebd7ff90f1d0ae411 (diff)
downloadvim-45b9961e2d3448a22991a928684160fdaa2c2b59.tar.gz
updated for version 7.3.1001v7.3.1001v7-3-1001
Problem: Duplicate condition in if. Solution: Remove one condition.
-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 9fcba449..518da1b7 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -1091,7 +1091,7 @@ nfa_regatom()
{
nfa_inc(&regparse);
- 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 b9315359..eefc21b8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1001,
+/**/
1000,
/**/
999,