mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-04 17:06:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3760 from Shougo/vim-7.4.623

Browse Source 
vim-patch:7.4.623
This commit is contained in:
Justin M. Keyes
2015-12-01 11:54:54 -05:00
parent 64a9972e7c 798fe6cfa3
commit 84da3e6bbb
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/regexp_nfa.c
View File

@@ -1897,9 +1897,10 @@ static int nfa_regpiece(void)
return OK; return OK;
} }
// The engine is very inefficient (uses too many states) when the maximum is // The engine is very inefficient (uses too many states) when the maximum
// much larger than the minimum. Bail out if we can use the other engine. // is much larger than the minimum and when the maximum is large. Bail out
if ((nfa_re_flags & RE_AUTO) && maxval > minval + 200) { // if we can use the other engine.
if ((nfa_re_flags & RE_AUTO) && (maxval > minval + 200 || maxval > 500)) {
return FAIL; return FAIL;
} }

2
src/nvim/version.c
View File

@@ -373,7 +373,7 @@ static int included_patches[] = {
// 626 NA // 626 NA
// 625 NA // 625 NA
// 624, // 624,
// 623, 623,
// 622 NA // 622 NA
// 621 NA // 621 NA
// 620, // 620,