updated for version 7.4.029

Problem:    An error in a pattern is reported twice.
Solution:   Remove the retry with the backtracking engine, it won't work.

diff --git a/src/regexp.c b/src/regexp.c
index df884e25bd09320bb459d2ef8a4a4d4339f84889..075374d16bbc8a34f92b5c8affc0cd89caedfbbe 100644 (file)
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -8016,12 +8016,11 @@ vim_regcomp(expr_arg, re_flags)
        }
 #endif
        /*
-        * If NFA engine failed, then revert to the backtracking engine.
-        * Except when there was a syntax error, which was properly handled by
-        * NFA engine.
-        */
+        * If the NFA engine failed, the backtracking engine won't work either.
+        *
        if (regexp_engine == AUTOMATIC_ENGINE)
            prog = bt_regengine.regcomp(expr, re_flags);
+        */
     }
 
     return prog;

diff --git a/src/version.c b/src/version.c
index a76b892bb369503f4d4b94c61ca3592148af69ea..5faeb35be008f366eb674eaab4ed04252371fa19 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    29,
 /**/
     28,
 /**/