From 93fc481b578b18c282e60d251455685602449526 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 23 Apr 2014 18:48:47 +0200
Subject: [PATCH] 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().

---
 src/regexp.c          |   2 ++
 src/testdir/test79.in | Bin 3123 -> 3381 bytes
 src/testdir/test79.ok | Bin 556 -> 574 bytes
 src/version.c         |   2 ++
 4 files changed, 4 insertions(+)

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 56955c23182a8809b9aa233afbc8f6d1148d07c1..8278bd80005bc3f7a985634b465f1af38391f171 100644
GIT binary patch
delta 254
zcmY++!3qIU6vpwj>jh+WOlh!i_fxZDMK)$(G10gVZl-f}=SUJ>Kq5~fc^0qZqEU9I
z{^$GMOONvTbm<l#$iU(<O_Zh?!~|>2bAVJ6!q{T6xE%+@!*oT8wV?_`np5nvb>FqR
zaF58K=BO4Bf<HCJhj0)6II+Hq7I|d}JWn7^azg}}+wj}TK2BKO{;4|=$RWEpGK4ad
o%|=JYq37_J9PG(o=e7Ct|E$DDw0o_n-H(LGo$uiW*Jm+)0b3eYMF0Q*

delta 14
WcmdlgwOL|9-^QI`+>@X2_yYhjhXz;x

diff --git a/src/testdir/test79.ok b/src/testdir/test79.ok
index 0f6ea4545106dbc331076866a7effa74ebcd0927..e22eee0b7134423d6b110867db0b38a671e84451 100644
GIT binary patch
delta 26
acmZ3(vX5nh4wDd9T7EuPQeqLD<^lj~*awjS

delta 7
OcmdnTvW8`Y4if+iCjwCb

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,
 /**/