vim-patch:7.4.554

Problem:    Missing part of patch 7.4.519.
Solution:   Copy back regprog after calling vim_regexec.

https://github.com/vim/vim/tree/v7-4-554
This commit is contained in:
David Bürgin
2015-04-26 11:41:51 +02:00
committed by Justin M. Keyes
parent b3519ca73b
commit d9a51ca811
2 changed files with 4 additions and 2 deletions

View File

@@ -561,7 +561,9 @@ restofline:
tail = NULL; tail = NULL;
regmatch.regprog = fmt_ptr->prog; regmatch.regprog = fmt_ptr->prog;
if (vim_regexec(&regmatch, IObuff, (colnr_T)0)) { int r = vim_regexec(&regmatch, IObuff, (colnr_T)0);
fmt_ptr->prog = regmatch.regprog;
if (r) {
if ((idx == 'C' || idx == 'Z') && !multiline) if ((idx == 'C' || idx == 'Z') && !multiline)
continue; continue;
if (vim_strchr((char_u *)"EWI", idx) != NULL) if (vim_strchr((char_u *)"EWI", idx) != NULL)

View File

@@ -215,7 +215,7 @@ static int included_patches[] = {
//557 NA //557 NA
//556 NA //556 NA
//555 NA //555 NA
//554, 554,
553, 553,
552, 552,
551, 551,