updated for version 7.0-217

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 80ac3f98e6c39ce5dbf0e6f8216be10769058e34..ffd90a137bd887d3f828c2ad455f04af80b5020e 100644 (file)
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -4677,11 +4677,12 @@ do_sub(eap)
                        /* For a multi-line match, put matchcol at the NUL at
                         * the end of the line and set nmatch to one, so that
                         * we continue looking for a match on the next line.
-                        * Avoids that ":s/\nB\@=//gc" get stuck. */
+                        * Avoids that ":%s/\nB\@=//gc" and ":%s/\n/,\r/gc"
+                        * get stuck when pressing 'n'. */
                        if (nmatch > 1)
                        {
                            matchcol = (colnr_T)STRLEN(sub_firstline);
-                           nmatch = 1;
+                           skip_match = TRUE;
                        }
                        goto skip;
                    }

diff --git a/src/version.c b/src/version.c
index 1517d0a1dc99c69bfdebbf55bb3aadebf0a6927d..b248fc350d9d298775a26aa86d2708e3a05bf1bd 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    217,
 /**/
     216,
 /**/