aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.4.554

Browse Source 
Problem:    Missing part of patch 7.4.519.
Solution:   Copy back regprog after calling vim_regexec.
This commit is contained in:
Bram Moolenaar 2014-12-17 14:41:10 +01:00
parent caad4f0a0b
commit 6f2dd9e75e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/quickfix.c
View File

@ -592,6 +592,8 @@ qf_init_ext(qi, efile, buf, tv, errorformat, newlist, lnumfirst, lnumlast,
restofline: restofline:
for ( ; fmt_ptr != NULL; fmt_ptr = fmt_ptr->next) for ( ; fmt_ptr != NULL; fmt_ptr = fmt_ptr->next)
{ {
int r;
idx = fmt_ptr->prefix; idx = fmt_ptr->prefix;
if (multiscan && vim_strchr((char_u *)"OPQ", idx) == NULL) if (multiscan && vim_strchr((char_u *)"OPQ", idx) == NULL)
continue; continue;
@ -607,7 +609,9 @@ restofline:
tail = NULL; tail = NULL;
regmatch.regprog = fmt_ptr->prog; regmatch.regprog = fmt_ptr->prog;
if (vim_regexec(&regmatch, IObuff, (colnr_T)0)) 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;

2
src/version.c
View File

@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
554,
/**/ /**/
553, 553,
/**/ /**/