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 | be2fbfd1b923be3f5297f18c2161b3cedb3ad68b (patch) | |
| tree | ffcb57c77aee970f2480f94c3e67918528805190 | |
| parent | 2cb270f7ce57f332ce954a8a84f3d29440d15052 (diff) | |
| download | vim-be2fbfd1b923be3f5297f18c2161b3cedb3ad68b.tar.gz | |
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 df884e25..075374d1 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 a76b892b..5faeb35b 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, |