summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/regexp.c2
-rw-r--r--src/testdir/test79.inbin3123 -> 3381 bytes
-rw-r--r--src/testdir/test79.okbin556 -> 574 bytes
-rw-r--r--src/version.c2
4 files changed, 4 insertions, 0 deletions
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
--- a/src/testdir/test79.in
+++ b/src/testdir/test79.in
Binary files differ
diff --git a/src/testdir/test79.ok b/src/testdir/test79.ok
index 0f6ea4545..e22eee0b7 100644
--- a/src/testdir/test79.ok
+++ b/src/testdir/test79.ok
Binary files differ
diff --git a/src/version.c b/src/version.c
index 1a112d7a4..8acd83e6a 100644
--- 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,