summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-02-08 22:45:17 +0100
committerBram Moolenaar <Bram@vim.org>2018-02-08 22:45:17 +0100
commitdff72ba4459f54cac2ce40eea3d92097660c7b9f (patch)
tree3df0f47369fd1d1ce5cbf89a893619f3fc451683
parentd317b38a4dbcdbd4cf587cf78cc1f4289374214e (diff)
patch 8.0.1478: unnecessary conditionv8.0.1478
Problem: Unnecessary condition for "len" being zero. Solution: Remove the condition. (Dominique Pelle)
-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 43fe5dc4d4..70003a05ba 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -6183,7 +6183,7 @@ nfa_regmatch(
{
/* If \Z was present, then ignore composing characters.
* When ignoring the base character this always matches. */
- if (len == 0 && sta->c != curc)
+ if (sta->c != curc)
result = FAIL;
else
result = OK;
diff --git a/src/version.c b/src/version.c
index ce9b89ccf3..6f0f78f0d0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1478,
+/**/
1477,
/**/
1476,