1
0
forked from aniani/vim

updated for version 7.4.261

Problem:    When updating the window involves a regexp pattern, an interactive
            substitute to replace a "\n" with a line break fails. (Ingo
            Karkat)
Solution:   Set reg_line_lbr in vim_regsub() and vim_regsub_multi().
This commit is contained in:
Bram Moolenaar
2014-04-23 18:48:47 +02:00
parent 9bdfb0025c
commit 93fc481b57
4 changed files with 4 additions and 0 deletions

View File

@@ -7381,6 +7381,7 @@ vim_regsub(rmp, source, dest, copy, magic, backslash)
reg_mmatch = NULL; reg_mmatch = NULL;
reg_maxline = 0; reg_maxline = 0;
reg_buf = curbuf; reg_buf = curbuf;
reg_line_lbr = TRUE;
return vim_regsub_both(source, dest, copy, magic, backslash); return vim_regsub_both(source, dest, copy, magic, backslash);
} }
#endif #endif
@@ -7400,6 +7401,7 @@ vim_regsub_multi(rmp, lnum, source, dest, copy, magic, backslash)
reg_buf = curbuf; /* always works on the current buffer! */ reg_buf = curbuf; /* always works on the current buffer! */
reg_firstlnum = lnum; reg_firstlnum = lnum;
reg_maxline = curbuf->b_ml.ml_line_count - lnum; reg_maxline = curbuf->b_ml.ml_line_count - lnum;
reg_line_lbr = FALSE;
return vim_regsub_both(source, dest, copy, magic, backslash); return vim_regsub_both(source, dest, copy, magic, backslash);
} }

Binary file not shown.

Binary file not shown.

View File

@@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
261,
/**/ /**/
260, 260,
/**/ /**/