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 2c364b30be9f9ca54ba35665eeeb1fdd85e6f30f..2023714e47a48b5e9f40d0db43db9e781963bd58 100644 (file)
--- 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 (file)
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 0f6ea4545106dbc331076866a7effa74ebcd0927..e22eee0b7134423d6b110867db0b38a671e84451 100644 (file)
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 1a112d7a48d7ca340d45980d5ca168cdb9ec3aea..8acd83e6a23cdf1b5406ca2a1bea284a063ff2e2 100644 (file)
--- 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,
 /**/