From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 23 Apr 2014 16:48:47 +0000 (+0200)
Subject: updated for version 7.4.261
X-Git-Tag: v7.4.261
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93fc481b578b18c282e60d251455685602449526;p=vim

updated for version 7.4.261
Problem:    When updating the window involves a regexp pattern, an interactive
            substitute to replace a "\n" with a line break fails. (Ingo
            Karkat)
Solution:   Set reg_line_lbr in vim_regsub() and vim_regsub_multi().
---

diff --git a/src/regexp.c b/src/regexp.c
index 2c364b30b..2023714e4 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -7381,6 +7381,7 @@ vim_regsub(rmp, source, dest, copy, magic, backslash)
     reg_mmatch = NULL;
     reg_maxline = 0;
     reg_buf = curbuf;
+    reg_line_lbr = TRUE;
     return vim_regsub_both(source, dest, copy, magic, backslash);
 }
 #endif
@@ -7400,6 +7401,7 @@ vim_regsub_multi(rmp, lnum, source, dest, copy, magic, backslash)
     reg_buf = curbuf;		/* always works on the current buffer! */
     reg_firstlnum = lnum;
     reg_maxline = curbuf->b_ml.ml_line_count - lnum;
+    reg_line_lbr = FALSE;
     return vim_regsub_both(source, dest, copy, magic, backslash);
 }
 
diff --git a/src/testdir/test79.in b/src/testdir/test79.in
index 56955c231..8278bd800 100644
Binary files a/src/testdir/test79.in and b/src/testdir/test79.in differ
diff --git a/src/testdir/test79.ok b/src/testdir/test79.ok
index 0f6ea4545..e22eee0b7 100644
Binary files a/src/testdir/test79.ok and b/src/testdir/test79.ok differ
diff --git a/src/version.c b/src/version.c
index 1a112d7a4..8acd83e6a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    261,
 /**/
     260,
 /**/