updated for version 7.3.796
Problem: "/[^\n]" does match at a line break.
Solution: Make it do the same as "/.". (Christian Brabandt)
diff --git a/src/regexp.c b/src/regexp.c
index b6506a0..d85ded8 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -2397,13 +2397,15 @@
/* '\n' in range: also match NL */
if (ret != JUST_CALC_SIZE)
{
- if (*ret == ANYBUT)
- *ret = ANYBUT + ADD_NL;
- else if (*ret == ANYOF)
+ /* Using \n inside [^] does not change what
+ * matches. "[^\n]" is the same as ".". */
+ if (*ret == ANYOF)
+ {
*ret = ANYOF + ADD_NL;
+ *flagp |= HASNL;
+ }
/* else: must have had a \n already */
}
- *flagp |= HASNL;
regparse++;
startc = -1;
}
@@ -4344,6 +4346,7 @@
break; /* Matched with EOW */
case ANY:
+ /* ANY does not match new lines. */
if (c == NUL)
status = RA_NOMATCH;
else
diff --git a/src/testdir/test79.in b/src/testdir/test79.in
index 8fa11d9..f83b6b6 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 6685b44..31ad3a4 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 e729a61..f289e43 100644
--- a/src/version.c
+++ b/src/version.c
@@ -726,6 +726,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 796,
+/**/
795,
/**/
794,
