From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 17 Dec 2014 13:41:10 +0000 (+0100)
Subject: updated for version 7.4.554
X-Git-Tag: v7.4.554
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f2dd9e75eab236d1bcc63b17d02f554111f87ec;p=vim

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 c8954cc53..abb4a6ecf 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(&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 eb867138f..cd7bfb129 100644
--- 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,
 /**/