diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-09-19 17:04:01 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-09-19 17:04:01 +0200 |
| commit | 917789fdf702b18edd9788adf5a60123b9a31ce8 (patch) | |
| tree | 872d862dc9deebb676cfb5a1338e2fbfc1b0980e | |
| parent | e6a2fa65732eb068b4d10f65e0a3f7353d3dffdc (diff) | |
updated for version 7.4.029v7.4.029
Problem: An error in a pattern is reported twice.
Solution: Remove the retry with the backtracking engine, it won't work.
| -rw-r--r-- | src/regexp.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/regexp.c b/src/regexp.c index df884e25bd..075374d16b 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 a76b892bb3..5faeb35be0 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 29, +/**/ 28, /**/ 27, |