From c432b5093714b8fd042ea5bee715dabf864701e3 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 15 Mar 2007 20:38:26 +0000 Subject: updated for version 7.0-217 --- src/ex_cmds.c | 5 +++-- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 80ac3f98e..ffd90a137 100644 --- 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 1517d0a1d..b248fc350 100644 --- 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, /**/ -- cgit v1.2.3