Mercurial > vim

changeset 6450:7e4c22ecc679 v7.4.554

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.554 Problem: Missing part of patch 7.4.519. Solution: Copy back regprog after calling vim_regexec.
author Bram Moolenaar <bram@vim.org>
date Wed, 17 Dec 2014 14:41:10 +0100
parents 93e9101dd543
children 101f8a418fb7
files src/quickfix.c src/version.c
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -592,6 +592,8 @@ qf_init_ext(qi, efile, buf, tv, errorfor
 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;
--- 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,