diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-02-22 01:11:42 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-02-22 01:11:42 -0500 |
| commit | bfe9ebcbe1a4aff708f0fce1ee0e0589be32e8d8 (patch) | |
| tree | cab9b8844f3fb20b19c89357195bcd280cdeecf7 /src | |
| parent | 95230ec7022b34dafa59fc334489f490a272eace (diff) | |
| parent | db20edef69aa3766ff7d7845ec54a894d686f8c0 (diff) | |
| download | rneovim-bfe9ebcbe1a4aff708f0fce1ee0e0589be32e8d8.tar.gz rneovim-bfe9ebcbe1a4aff708f0fce1ee0e0589be32e8d8.tar.bz2 rneovim-bfe9ebcbe1a4aff708f0fce1ee0e0589be32e8d8.zip | |
Merge pull request #4272 from watiko/vim-7.4.937
vim-patch:7.4.937
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/regexp_nfa.c | 3 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c index dd41535110..e2849fb17a 100644 --- a/src/nvim/regexp_nfa.c +++ b/src/nvim/regexp_nfa.c @@ -6180,7 +6180,8 @@ static long nfa_regtry(nfa_regprog_T *prog, colnr_T col) if (prog->reghasz == REX_SET) { cleanup_zsubexpr(); re_extmatch_out = make_extmatch(); - for (i = 0; i < subs.synt.in_use; i++) { + // Loop over \z1, \z2, etc. There is no \z0. + for (i = 1; i < subs.synt.in_use; i++) { if (REG_MULTI) { struct multipos *mpos = &subs.synt.list.multi[i]; diff --git a/src/nvim/version.c b/src/nvim/version.c index 4db0cb4b08..9c29dc350c 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -353,7 +353,7 @@ static int included_patches[] = { // 940 NA 939, // 938 NA - // 937, + 937, // 936, // 935 NA // 934 NA |