Merge pull request #4272 from watiko/vim-7.4.937

vim-patch:7.4.937
This commit is contained in:
Justin M. Keyes
2016-02-22 01:11:42 -05:00
2 changed files with 3 additions and 2 deletions

View File

@@ -6180,7 +6180,8 @@ static long nfa_regtry(nfa_regprog_T *prog, colnr_T col)
if (prog->reghasz == REX_SET) { if (prog->reghasz == REX_SET) {
cleanup_zsubexpr(); cleanup_zsubexpr();
re_extmatch_out = make_extmatch(); 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) { if (REG_MULTI) {
struct multipos *mpos = &subs.synt.list.multi[i]; struct multipos *mpos = &subs.synt.list.multi[i];

View File

@@ -353,7 +353,7 @@ static int included_patches[] = {
// 940 NA // 940 NA
939, 939,
// 938 NA // 938 NA
// 937, 937,
// 936, // 936,
// 935 NA // 935 NA
// 934 NA // 934 NA