vim-patch: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().

https://code.google.com/p/vim/source/detail?r=43c6cd07c8defd8505acbe479c6970764c08e6f9
This commit is contained in:
Marco Hinz
2014-04-23 19:09:45 +02:00
committed by Thiago de Arruda
parent ae4090b2ce
commit 6a63b0986f
4 changed files with 9 additions and 0 deletions

View File

@@ -6513,6 +6513,7 @@ int vim_regsub(regmatch_T *rmp, char_u *source, char_u *dest, int copy, int magi
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);
} }
@@ -6523,6 +6524,7 @@ int vim_regsub_multi(regmmatch_T *rmp, linenr_T lnum, char_u *source, char_u *de
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

@@ -202,6 +202,13 @@ 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
//265,
//264,
//263,
//262,
261,
//260,
//259,
//258, //258,
//257, //257,
//256, //256,