diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-12-17 14:41:10 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-12-17 14:41:10 +0100 |
| commit | 6f2dd9e75eab236d1bcc63b17d02f554111f87ec (patch) | |
| tree | 039d8e8ecfdcd0088c6e963ac0c82c498a3365bd | |
| parent | caad4f0a0b428f3dc4e9e395ad0b1cddb38d3bcd (diff) | |
updated for version 7.4.554v7.4.554
Problem: Missing part of patch 7.4.519.
Solution: Copy back regprog after calling vim_regexec.
| -rw-r--r-- | src/quickfix.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/quickfix.c b/src/quickfix.c index c8954cc531..abb4a6ecf3 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -592,6 +592,8 @@ qf_init_ext(qi, efile, buf, tv, errorformat, newlist, lnumfirst, lnumlast, restofline: for ( ; fmt_ptr != NULL; fmt_ptr = fmt_ptr->next) { + int r; + idx = fmt_ptr->prefix; if (multiscan && vim_strchr((char_u *)"OPQ", idx) == NULL) continue; @@ -607,7 +609,9 @@ restofline: tail = NULL; regmatch.regprog = fmt_ptr->prog; - if (vim_regexec(®match, IObuff, (colnr_T)0)) + r = vim_regexec(®match, IObuff, (colnr_T)0); + fmt_ptr->prog = regmatch.regprog; + if (r) { if ((idx == 'C' || idx == 'Z') && !multiline) continue; diff --git a/src/version.c b/src/version.c index eb867138fd..cd7bfb1291 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 554, +/**/ 553, /**/ 552, |