diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-11-02 20:06:23 -0400 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2016-11-02 20:06:23 -0400 |
| commit | 01f1028496bd1a402ad1b11c311291ec96335b70 (patch) | |
| tree | 7760ee92dc812eaf1eb98456a8d62409ba0915c1 /src/nvim/regexp_nfa.c | |
| parent | 9ef4be9aab6a9a16cf185ca17a2dabe87f8aa328 (diff) | |
| parent | b8bb1f6729038bcfbae486114956505ffe423bbf (diff) | |
| download | rneovim-01f1028496bd1a402ad1b11c311291ec96335b70.tar.gz rneovim-01f1028496bd1a402ad1b11c311291ec96335b70.tar.bz2 rneovim-01f1028496bd1a402ad1b11c311291ec96335b70.zip | |
Merge pull request #5524 from brcolow/vim-7.4.1967
vim-patch:7.4.1967
Diffstat (limited to 'src/nvim/regexp_nfa.c')
| -rw-r--r-- | src/nvim/regexp_nfa.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c index 35308b7411..384568259f 100644 --- a/src/nvim/regexp_nfa.c +++ b/src/nvim/regexp_nfa.c @@ -4560,9 +4560,11 @@ static int recursive_regmatch(nfa_state_T *state, nfa_pim_T *pim, nfa_regprog_T if (REG_MULTI) regline = reg_getline(reglnum); reginput = regline + save_reginput_col; - nfa_match = save_nfa_match; + if (result != NFA_TOO_EXPENSIVE) { + nfa_match = save_nfa_match; + nfa_listid = save_nfa_listid; + } nfa_endp = save_nfa_endp; - nfa_listid = save_nfa_listid; #ifdef REGEXP_DEBUG log_fd = fopen(NFA_REGEXP_RUN_LOG, "a"); |