commit ceb84af027ac782f0b9de0e66f321258358e391a
author Bram Moolenaar <Bram@vim.org> Sun Sep 29 21:11:05 2013 +0200
committer Bram Moolenaar <Bram@vim.org> Sun Sep 29 21:11:05 2013 +0200
tree 22f08b3f3763b3f20dbef2b2faef8082e9dcc964
parent 8962fda1dacf374d78bd02ca487800c2519c57b2

updated for version 7.4.045
Problem:    substitute() does not work properly when the pattern starts with
            "\ze".
Solution:   Detect an empty match. (Christian Brabandt)

src/eval.c

diff --git a/src/eval.c b/src/eval.c
index 03e3735..68f80fc 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -24301,6 +24301,7 @@
     garray_T	ga;
     char_u	*ret;
     char_u	*save_cpo;
+    int		zero_width;
 
     /* Make 'cpoptions' empty, so that the 'l' flag doesn't work here */
     save_cpo = p_cpo;
@@ -24339,20 +24340,17 @@
 	    (void)vim_regsub(&regmatch, sub, (char_u *)ga.ga_data
 					  + ga.ga_len + i, TRUE, TRUE, FALSE);
 	    ga.ga_len += i + sublen - 1;
-	    /* avoid getting stuck on a match with an empty string */
-	    if (tail == regmatch.endp[0])
+	    zero_width = (tail == regmatch.endp[0]
+				    || regmatch.startp[0] == regmatch.endp[0]);
+	    tail = regmatch.endp[0];
+	    if (*tail == NUL)
+		break;
+	    if (zero_width)
 	    {
-		if (*tail == NUL)
-		    break;
+		/* avoid getting stuck on a match with an empty string */
 		*((char_u *)ga.ga_data + ga.ga_len) = *tail++;
 		++ga.ga_len;
 	    }
-	    else
-	    {
-		tail = regmatch.endp[0];
-		if (*tail == NUL)
-		    break;
-	    }
 	    if (!do_all)
 		break;
 	}

src/testdir/test80.in

diff --git a/src/testdir/test80.in b/src/testdir/test80.in
index 7f6ecfc..5491a90 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 45b1d1d..562bbf2 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 52ad91e..63882ee 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    45,
+/**/
     44,
 /**/
     43,