updated for version 7.4.554

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

diff --git a/src/quickfix.c b/src/quickfix.c
index c8954cc5319d6e3a02662fcd1af7723ace6bd8de..abb4a6ecf3a1042da0aa407db2a630b6624a7651 100644 (file)
--- 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(&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)
                    continue;

diff --git a/src/version.c b/src/version.c
index eb867138fd732deff0e889a2d9040c285dd4e7e7..cd7bfb1291cce01ee50819f649aae144b8a7c26a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    554,
 /**/
     553,
 /**/