diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-12-01 11:54:54 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-12-01 11:54:54 -0500 |
| commit | 84da3e6bbbea89765c1218a8659304823c7045e0 (patch) | |
| tree | 14a0226984fb5c38c15b12e7a8c9bedc5c3a3416 | |
| parent | 64a9972e7c73f61d6067f7824eb782e5a59739bd (diff) | |
| parent | 798fe6cfa35b96ac14c0682e93567fa32123048c (diff) | |
| download | rneovim-84da3e6bbbea89765c1218a8659304823c7045e0.tar.gz rneovim-84da3e6bbbea89765c1218a8659304823c7045e0.tar.bz2 rneovim-84da3e6bbbea89765c1218a8659304823c7045e0.zip | |
Merge pull request #3760 from Shougo/vim-7.4.623
vim-patch:7.4.623
| -rw-r--r-- | src/nvim/regexp_nfa.c | 7 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c index fa356da5b9..b96dcc66b3 100644 --- a/src/nvim/regexp_nfa.c +++ b/src/nvim/regexp_nfa.c @@ -1897,9 +1897,10 @@ static int nfa_regpiece(void) return OK; } - // The engine is very inefficient (uses too many states) when the maximum is - // much larger than the minimum. Bail out if we can use the other engine. - if ((nfa_re_flags & RE_AUTO) && maxval > minval + 200) { + // The engine is very inefficient (uses too many states) when the maximum + // is much larger than the minimum and when the maximum is large. Bail out + // if we can use the other engine. + if ((nfa_re_flags & RE_AUTO) && (maxval > minval + 200 || maxval > 500)) { return FAIL; } diff --git a/src/nvim/version.c b/src/nvim/version.c index 8a6a47c214..c2a3193344 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -373,7 +373,7 @@ static int included_patches[] = { // 626 NA // 625 NA // 624, - // 623, + 623, // 622 NA // 621 NA // 620, |