diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-03-15 20:38:26 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-03-15 20:38:26 +0000 |
| commit | c432b5093714b8fd042ea5bee715dabf864701e3 (patch) | |
| tree | e0df4f97964a4e714537dd8a1ab748f210e4d696 | |
| parent | d326ce83d57b6271692842674839fcf1e639f75b (diff) | |
| download | vim-c432b5093714b8fd042ea5bee715dabf864701e3.zip | |
updated for version 7.0-217
| -rw-r--r-- | src/ex_cmds.c | 5 | ||||
| -rw-r--r-- | 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 @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 217, +/**/ 216, /**/ 215, |