# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1359566511 -3600
# Node ID 2c12c4e2fae8db60fbdf58b34c8b73eacdc32665
# Parent  45b91f2bc424eaaf97e96bf635e8b89c11435610
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
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -2397,13 +2397,15 @@ collection:
 			    /* '\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 @@ regmatch(scan)
 	    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 8fa11d9ad79cd389169051166babb22d8e1f4041..f83b6b6e2265fe6f2581e015e3e0e94c01ed3fa6
GIT binary patch
literal 2575
zc%1E4OK;jh5av8mt~t9=f&)!F;hj)%;9=f*0Pd+%Dr3we7@OFp?Ww=LHj9lnC;|?>
zRhCxYxBJa{_nY0Z72R=#iDe5(XFa;L^_8J&`mM9lwYh2}1=Sq$Bl_=^tvk-#GLwR3
z3Po?sap&&Z)g@4ZxxCJ$>T0v=1gD8gl11lge+C#R<-VfG0|knXB{)mfFr=UJCCE>;
zO)vCyXKlESU`+(qo2!s2@<F;QEY;~;V^CXJaloNJhVWW+u#E9ILlvYgs?xPYiDMh2
zJ9?mdDo~zsl%))%Da9tL;g|s#|1eNT+M)*1dOBseiS%_w@{F+-lF@20+(zoQNp3UN
z@pKE)7mRiB{EVSTB%7fpq@eQ|$z<pSX~a+u$z`aIL<|j(G=>yBkKxW)zy0CaS%wN!
zQ|U}LmoMBuKn-N5Lj#)7f;M!(=o+wmT!Q&zg7s{{>SYCQy*IG?HaG(ZT*ckXh-sag
z6I%Yy$}TJEf0C6=PU0UXg-RlcVO~5Eu&U3_&&0r9e=MXjlZL#$;kFq1?S;m~&~ZOB
zpsj6az}p*cilObL3$iZ)+kIwUymu;71huTfs4@brs=>H623^)+QlG%IF@;%k2J_Y&
zUfZv*=qxt2oovglU|olW?k;g7h?3|v<TqksXWRifr>`E=d&WlewZrrC0rC+G;v?#Z
zBkZWYad-={sJ?l`7Px@cF<amw+J_^|sJ?SZ@1MhnzI#}2273OuX8-kZJ+X+EB5N0<
z-FN(fWA_{@a4gTU9LKU8%Wy2svDBVZIj;on%HIbj1X~Zx_*@EZts30NtKH~rDY$f6
zaGS2)zc#<Eyk5aQ&3K77bNl+eUL5u=!T%<F8<P3G#}7*v6U!Q@_Fk1Mc&j?|))lKj
p&wHXPo8mBJDBa+28;N5mroP~C`~QSDm%rXVZGNF7Ywd>f{{@Y{$SnW>

diff --git a/src/testdir/test79.ok b/src/testdir/test79.ok
index 6685b44f9ad2366519b66ddc20078429269f7e43..31ad3a41e46912727705358d815ae596c8a19a7a
GIT binary patch
literal 401
zc$}q>J#WG=6aX3NN&E+vX3sZdgQ|j-sV(D^DhLS>XaccW`R#qsWGYPP7VFt}mi?KT
z)83kXmG^CCZ0sh${Pk=8t*g-phZooLgD{E*!{H!~!oc@jR?3;ln(2n^8^t@b9ed?R
zDSIVVr{d5(aC|yaON~hlwqx72m*6;z@3hYkwf%&JELe&xNtKmoG7}*qmpW&yYy^$#
xY)c_!!H&Nxnnchhn!+`3@oDs{eUbU+hWc$cUe)YIT2@k?+exhFm9g@n@C#E$ULpVh

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