# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1398271727 -7200
# Node ID 43c6cd07c8defd8505acbe479c6970764c08e6f9
# Parent  81784024a6ab3ef95ef81cc6a64d8a2878be6cd9
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
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -7381,6 +7381,7 @@ vim_regsub(rmp, source, dest, copy, magi
     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
     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
GIT binary patch
literal 3381
zc%1E5&2!p15a+xzx#p}gO$@xmD*1rKZ#X32B#<<1639DrOU4)h4n`*aNZy-H`?ps{
zHX!!{a_H?1Gn)NLyQ|gy#A@AUK}ZIkPf9`5+x6MhwQRN<OquOiZi!gDudc9vr#=e;
z$Kxg9abk$IAauegWID7{Ut)4%h4!dWRCJbAN=C5t8xKZ6<c<y>66EB?2}gvu4riq2
zGi$5^+_g_`+iml%4MyORU}Cwh{_IS^yl%{9;g$uF8wSK1kWl!omJQX2g=At49b1a_
z)Y}Hyjn^nV8Ua0_+uKq)rI<){Ea+HVccAzVkMRhrSiwU)z<u1qvUJp-eJPmqn-tC{
zCek^@XgHMe1;x$?&5=Y+if*$h<rc-O7Md-IE`{D0*;t}0y15~x_Y{38T~kaaKTzaS
z`be=Sr5lQ&lx``al<p|nQfkx9oRm6ZTa2Pkgf5yLId?BMNB92u9wRiL>4JfHd=P0r
zfm5iL_x2ACE7hZ8Xn+Z4a1IyHgce+ad*#C9{RH?m2k(Oi(~nblx_JWs)`#FOfUq4x
z2kw7hk9)7>4=4XK_<9ES{uqNZ{<eQfAl5Y0<{S!;qI!%rH?)+Bcx?_%sXE7JGwf?~
zZiH!0o3j&}rm&fqrnoi3T$@u=%cGx9DT)!#XS20$fOTR)@3aSY-G+Xn56omRI2*w5
zd<dh95jaf;9$Swvz8ud|_v*APYGz?xYu^=jh^A{|z<AJ#i^Q!^SM=*E^+jTr^c$=F
zs|My80jU;et1bLx{qxmF$Svz%tZ@Xzpt;Tw6pPks3%;y>xk^92hfDfbtMz%RuU^-K
zKYd+aS#WDhu@imKN*pWbNI_KvRTOlnpaTW%D`-za<@Epa>i9!nG%bZsi*xLdvY=sc
zk_<k|;A#d}GWalq4>EW^gZDDH9OKVFT!ceW<rfwHbRqtN?v&(|_P=UreX`QZv$a^=
zt)=C~PV2^2HiAm>&WPt_%`5g$P4?8)i<1QK)7iQ%NeX?72Ze+!m8@b~+jQiOwY5!r
z(DBReS92{3+P!%T@w5G@i~RGA8mXQicwWznpBf`iPM$rdAGgHJ_eF0!Yk&jN_u{Tr
zWM&$-(f>HS@4W<iCZ$!8(hZT+oJea<BsLd6-8o2pCftbMa;^svw?om~zaecWblIJZ
zz6hfCjx#@E_L$U&CZf|w?HkcVjG9>VSs3}8<nzFIKlLHm3S&Pq3$?8;ir24T&~AK)
z2ahuvP`wmCslqq%<m}0E_~QL!*@piXr%l~JYM>lzNV{`H^&Q$x>}Vg1^53+Zd@9hL
dw=Yj`W?u`s7lmNh;-i8LnIOgTMHbTCz5_ODzWD$E

diff --git a/src/testdir/test79.ok b/src/testdir/test79.ok
index 0f6ea4545106dbc331076866a7effa74ebcd0927..e22eee0b7134423d6b110867db0b38a671e84451
GIT binary patch
literal 574
zc$}?}J9C0S6ooC5Gn4;76SlG8jZ_h2@~V=k4NEeBprQfgVd-zr)dicFE^}u1?%v^?
zv+$nQ?Y60<GLxFLZY;$CF!evCUo?%!kl`t+rW>YZk4Cm-8oH(`Sdfl*T;gek^)vDp
zyl${1eUpm20_C8@?q-Mm?H(1cP$xB-L4#S_&TyE|4}FX3K$hYD(Q^E!7R^D#BgCA?
zNJtA#;VI`xk?|_SlC<KW8rrRq^CHIvqO6P1`-m>#9B}fZv!C53Gk$pu`juC{F9?`>
zS+j5`1+0TDU<sH4hJY@h38(@J3&Xz6q??iw-1i%c`bjP+VBY5g3q2YpGz=v+VIduS
Tak%#M>4i5Ekd-CksJak8w9bc;

diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    261,
+/**/
     260,
 /**/
     259,