From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 19 Sep 2013 15:04:01 +0000 (+0200)
Subject: updated for version 7.4.029
X-Git-Tag: v7.4.029
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=917789fdf702b18edd9788adf5a60123b9a31ce8;p=vim

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 df884e25b..075374d16 100644
--- 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 a76b892bb..5faeb35be 100644
--- 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,
 /**/