updated for version 7.4.101
Problem: Using \1 in pattern goes one line too far. (Bohr Shaw, John Little)
Solution: Only advance the match end for the matched characters in the last
line.
diff --git a/src/regexp.c b/src/regexp.c
index 075374d..f1e8909 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -6455,7 +6455,8 @@
/*
* Check whether a backreference matches.
* Returns RA_FAIL, RA_NOMATCH or RA_MATCH.
- * If "bytelen" is not NULL, it is set to the bytelength of the whole match.
+ * If "bytelen" is not NULL, it is set to the byte length of the match in the
+ * last line.
*/
static int
match_with_backref(start_lnum, start_col, end_lnum, end_col, bytelen)
@@ -6511,6 +6512,8 @@
/* Advance to next line. */
reg_nextline();
+ if (bytelen != NULL)
+ *bytelen = 0;
++clnum;
ccol = 0;
if (got_int)
diff --git a/src/testdir/test64.in b/src/testdir/test64.in
index 77949c5..29bf0b9 100644
--- a/src/testdir/test64.in
+++ b/src/testdir/test64.in
@@ -507,6 +507,8 @@
:" Check a pattern with a line break and ^ and $
:call add(tl, [2, 'a\n^b$\n^c', ['a', 'b', 'c'], ['XX']])
:"
+:call add(tl, [2, '\(^.\+\n\)\1', [' dog', ' dog', 'asdf'], ['XXasdf']])
+:"
:"""" Run the multi-line tests
:"
:$put ='multi-line tests'
diff --git a/src/testdir/test64.ok b/src/testdir/test64.ok
index 4bbc533..a1498ea 100644
--- a/src/testdir/test64.ok
+++ b/src/testdir/test64.ok
@@ -1031,6 +1031,9 @@
OK 0 - a\n^b$\n^c
OK 1 - a\n^b$\n^c
OK 2 - a\n^b$\n^c
+OK 0 - \(^.\+\n\)\1
+OK 1 - \(^.\+\n\)\1
+OK 2 - \(^.\+\n\)\1
<T="5">Ta 5</Title>
<T="7">Ac 7</Title>
diff --git a/src/version.c b/src/version.c
index ab3711d..47deb0c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 101,
+/**/
100,
/**/
99,
