Mercurial > vim
changeset 1499:75c88515e0db v7.1.214
updated for version 7.1-214
| author | vimboss |
|---|---|
| date | Wed, 09 Jan 2008 21:40:50 +0000 |
| parents | 4845822f6a6c |
| children | ea9f418ed072 |
| files | src/ex_cmds.c src/version.c |
| diffstat | 2 files changed, 51 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -4200,7 +4200,6 @@ do_sub(eap) linenr_T old_line_count = curbuf->b_ml.ml_line_count; linenr_T line2; long nmatch; /* number of lines in match */ - linenr_T sub_firstlnum; /* nr of first sub line */ char_u *sub_firstline; /* allocated copy of first sub line */ int endcolumn = FALSE; /* cursor in last column when done */ pos_T old_cursor = curwin->w_cursor; @@ -4447,7 +4446,6 @@ do_sub(eap) #endif ); ++lnum) { - sub_firstlnum = lnum; nmatch = vim_regexec_multi(®match, curwin, curbuf, lnum, (colnr_T)0); if (nmatch) { @@ -4463,6 +4461,7 @@ do_sub(eap) long nmatch_tl = 0; /* nr of lines matched below lnum */ int do_again; /* do it again after joining lines */ int skip_match = FALSE; + linenr_T sub_firstlnum; /* nr of first sub line */ /* * The new text is build up step by step, to avoid too much @@ -4482,8 +4481,10 @@ do_sub(eap) * far. * new_end The new text, where to append new text. * - * lnum The line number where we were looking for the - * first match in the old line. + * lnum The line number where we found the start of + * the match. Can be below the line we searched + * when there is a \n before a \zs in the + * pattern. * sub_firstlnum The line number in the buffer where to look * for a match. Can be different from "lnum" * when the pattern or substitute string contains @@ -4507,12 +4508,7 @@ do_sub(eap) * updating the screen or handling a multi-line match. The "old_" * pointers point into this copy. */ - sub_firstline = vim_strsave(ml_get(sub_firstlnum)); - if (sub_firstline == NULL) - { - vim_free(new_start); - goto outofmem; - } + sub_firstlnum = lnum; copycol = 0; matchcol = 0; @@ -4533,6 +4529,28 @@ do_sub(eap) */ for (;;) { + /* Advance "lnum" to the line where the match starts. The + * match does not start in the first line when there is a line + * break before \zs. */ + if (regmatch.startpos[0].lnum > 0) + { + lnum += regmatch.startpos[0].lnum; + sub_firstlnum += regmatch.startpos[0].lnum; + nmatch -= regmatch.startpos[0].lnum; + vim_free(sub_firstline); + sub_firstline = NULL; + } + + if (sub_firstline == NULL) + { + sub_firstline = vim_strsave(ml_get(sub_firstlnum)); + if (sub_firstline == NULL) + { + vim_free(new_start); + goto outofmem; + } + } + /* Save the line number of the last change for the final * cursor position (just like Vi). */ curwin->w_cursor.lnum = lnum; @@ -4638,7 +4656,8 @@ do_sub(eap) temp = RedrawingDisabled; RedrawingDisabled = 0; - search_match_lines = regmatch.endpos[0].lnum; + search_match_lines = regmatch.endpos[0].lnum + - regmatch.startpos[0].lnum; search_match_endcol = regmatch.endpos[0].col; highlight_match = TRUE; @@ -4749,7 +4768,8 @@ do_sub(eap) * 3. substitute the string. */ /* get length of substitution part */ - sublen = vim_regsub_multi(®match, sub_firstlnum, + sublen = vim_regsub_multi(®match, + sub_firstlnum - regmatch.startpos[0].lnum, sub, sub_firstline, FALSE, p_magic, TRUE); /* When the match included the "$" of the last line it may @@ -4819,7 +4839,8 @@ do_sub(eap) mch_memmove(new_end, sub_firstline + copycol, (size_t)i); new_end += i; - (void)vim_regsub_multi(®match, sub_firstlnum, + (void)vim_regsub_multi(®match, + sub_firstlnum - regmatch.startpos[0].lnum, sub, new_end, TRUE, p_magic, TRUE); sub_nsubs++; did_sub = TRUE; @@ -4908,10 +4929,13 @@ do_sub(eap) skip: /* We already know that we did the last subst when we are at * the end of the line, except that a pattern like - * "bar\|\nfoo" may match at the NUL. */ + * "bar\|\nfoo" may match at the NUL. "lnum" can be below + * "line2" when there is a \zs in the pattern after a line + * break. */ lastone = (skip_match || got_int || got_quit + || lnum > line2 || !(do_all || do_again) || (sub_firstline[matchcol] == NUL && nmatch <= 1 && !re_multiline(regmatch.regprog))); @@ -4926,12 +4950,15 @@ skip: * When asking the user we like to show the already replaced * text, but don't do it when "\<@=" or "\<@!" is used, it * changes what matches. + * When the match starts below where we start searching also + * need to replace the line first (using \zs after \n). */ if (lastone || (do_ask && !re_lookbehind(regmatch.regprog)) || nmatch_tl > 0 || (nmatch = vim_regexec_multi(®match, curwin, - curbuf, sub_firstlnum, matchcol)) == 0) + curbuf, sub_firstlnum, matchcol)) == 0 + || regmatch.startpos[0].lnum > 0) { if (new_start != NULL) { @@ -5001,7 +5028,14 @@ skip: * 5. break if there isn't another match in this line */ if (nmatch <= 0) + { + /* If the match found didn't start where we were + * searching, do the next search in the line where we + * found the match. */ + if (nmatch == -1) + lnum -= regmatch.startpos[0].lnum; break; + } } line_breakcheck();