commit 8af269186c71d6835e563bfaa35fe5c50d10513d
author Bram Moolenaar <Bram@vim.org> Thu Jan 23 20:09:34 2014 +0100
committer Bram Moolenaar <Bram@vim.org> Thu Jan 23 20:09:34 2014 +0100
tree 56dc6fc4ef32c4874afd542097227de8dc45073b
parent b4d587cbd9450d1a28dfb40c5204e9071f7bd955

updated for version 7.4.158
Problem:    Pattern containing \zs is not handled correctly by substitute().
Solution:   Change how an empty match is skipped. (Yukihiro Nakadaira)

src/eval.c

diff --git a/src/eval.c b/src/eval.c
index 7b7302f..3786adf 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -24365,7 +24365,7 @@
     garray_T	ga;
     char_u	*ret;
     char_u	*save_cpo;
-    int		zero_width;
+    char_u	*zero_width = NULL;
 
     /* Make 'cpoptions' empty, so that the 'l' flag doesn't work here */
     save_cpo = p_cpo;
@@ -24382,6 +24382,19 @@
 	tail = str;
 	while (vim_regexec_nl(&regmatch, str, (colnr_T)(tail - str)))
 	{
+	    /* Skip empty match except for first match. */
+	    if (regmatch.startp[0] == regmatch.endp[0])
+	    {
+		if (zero_width == regmatch.startp[0])
+		{
+		    /* avoid getting stuck on a match with an empty string */
+		    *((char_u *)ga.ga_data + ga.ga_len) = *tail++;
+		    ++ga.ga_len;
+		    continue;
+		}
+		zero_width = regmatch.startp[0];
+	    }
+
 	    /*
 	     * Get some space for a temporary buffer to do the substitution
 	     * into.  It will contain:
@@ -24404,17 +24417,9 @@
 	    (void)vim_regsub(&regmatch, sub, (char_u *)ga.ga_data
 					  + ga.ga_len + i, TRUE, TRUE, FALSE);
 	    ga.ga_len += i + sublen - 1;
-	    zero_width = (tail == regmatch.endp[0]
-				    || regmatch.startp[0] == regmatch.endp[0]);
 	    tail = regmatch.endp[0];
 	    if (*tail == NUL)
 		break;
-	    if (zero_width)
-	    {
-		/* avoid getting stuck on a match with an empty string */
-		*((char_u *)ga.ga_data + ga.ga_len) = *tail++;
-		++ga.ga_len;
-	    }
 	    if (!do_all)
 		break;
 	}

src/testdir/test80.in

diff --git a/src/testdir/test80.in b/src/testdir/test80.in
index 5491a90..c62fdc0 100644
--- a/src/testdir/test80.in
+++ b/src/testdir/test80.in
Binary files differ

src/testdir/test80.ok

diff --git a/src/testdir/test80.ok b/src/testdir/test80.ok
index 562bbf2..2b79d37 100644
--- a/src/testdir/test80.ok
+++ b/src/testdir/test80.ok
Binary files differ

src/version.c

diff --git a/src/version.c b/src/version.c
index b80bacd..00e1ae6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    158,
+/**/
     157,
 /**/
     156,