patch 8.0.1478: unnecessary condition

Problem:    Unnecessary condition for "len" being zero.
Solution:   Remove the condition. (Dominique Pelle)

diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 43fe5dc4d4b2bd6d736559086578341571aad5e6..70003a05ba0055845d56b10f62b6c55c1a7c6c94 100644 (file)
--- 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 ce9b89ccf367ab6bcfdcf51be25383cc039b550c..6f0f78f0d0ed5c5690b500be59fd071589702be8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1478,
 /**/
     1477,
 /**/