From d9a51ca8119ba05056d593b8ca5b7161d12fc1c1 Mon Sep 17 00:00:00 2001
From: David Bürgin <676c7473@gmail.com>
Date: Sun, 26 Apr 2015 11:41:51 +0200
Subject: vim-patch:7.4.554

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

https://github.com/vim/vim/tree/v7-4-554
---
 src/nvim/quickfix.c | 4 +++-
 src/nvim/version.c  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index 5cf2f4d5a7..a37a41caeb 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -561,7 +561,9 @@ restofline:
       tail = NULL;
 
       regmatch.regprog = fmt_ptr->prog;
-      if (vim_regexec(&regmatch, IObuff, (colnr_T)0)) {
+      int r = vim_regexec(&regmatch, IObuff, (colnr_T)0);
+      fmt_ptr->prog = regmatch.regprog;
+      if (r) {
         if ((idx == 'C' || idx == 'Z') && !multiline)
           continue;
         if (vim_strchr((char_u *)"EWI", idx) != NULL)
diff --git a/src/nvim/version.c b/src/nvim/version.c
index b80f91e294..d4c2a42250 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -215,7 +215,7 @@ static int included_patches[] = {
   //557 NA
   //556 NA
   //555 NA
-  //554,
+  554,
   553,
   552,
   551,
-- 
cgit