thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.4.064

Browse Source 
Problem:    When replacing a character in Visual block mode, entering a CR
            does not cause a repeated line break.
Solution:   Recognize the situation and repeat the line break. (Christian
            Brabandt)
This commit is contained in:
Bram Moolenaar
2013-11-04 01:41:17 +01:00
parent ba2d7ffc4b
commit d9820538bd
5 changed files with 48 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/ops.c
View File

@@ -2074,10 +2074,15 @@ op_replace(oap, c)
char_u *newp, *oldp;
size_t oldlen;
struct block_def bd;
char_u *after_p = NULL;
int had_ctrl_v_cr = (c == -1 || c == -2);
if ((curbuf->b_ml.ml_flags & ML_EMPTY ) || oap->empty)
return OK; /* nothing to do */
if (had_ctrl_v_cr)
c = (c == -1 ? '\r' : '\n');
#ifdef FEAT_MBYTE
if (has_mbyte)
mb_adjust_opend(oap);
@@ -2164,25 +2169,43 @@ op_replace(oap, c)
/* insert pre-spaces */
copy_spaces(newp + bd.textcol, (size_t)bd.startspaces);
/* insert replacement chars CHECK FOR ALLOCATED SPACE */
#ifdef FEAT_MBYTE
if (has_mbyte)
/* -1/-2 is used for entering CR literally. */
if (had_ctrl_v_cr || (c != '\r' && c != '\n'))
{
n = (int)STRLEN(newp);
while (--num_chars >= 0)
n += (*mb_char2bytes)(c, newp + n);
#ifdef FEAT_MBYTE
if (has_mbyte)
{
n = (int)STRLEN(newp);
while (--num_chars >= 0)
n += (*mb_char2bytes)(c, newp + n);
}
else
#endif
copy_chars(newp + STRLEN(newp), (size_t)numc, c);
if (!bd.is_short)
{
/* insert post-spaces */
copy_spaces(newp + STRLEN(newp), (size_t)bd.endspaces);
/* copy the part after the changed part */
STRMOVE(newp + STRLEN(newp), oldp);
}
}
else
#endif
copy_chars(newp + STRLEN(newp), (size_t)numc, c);
if (!bd.is_short)
{
/* insert post-spaces */
copy_spaces(newp + STRLEN(newp), (size_t)bd.endspaces);
/* copy the part after the changed part */
STRMOVE(newp + STRLEN(newp), oldp);
/* Replacing with \r or \n means splitting the line. */
after_p = alloc_check((unsigned)oldlen + 1 + n - STRLEN(newp));
if (after_p != NULL)
STRMOVE(after_p, oldp);
}
/* replace the line */
ml_replace(curwin->w_cursor.lnum, newp, FALSE);
if (after_p != NULL)
{
ml_append(curwin->w_cursor.lnum++, after_p, 0, FALSE);
appended_lines_mark(curwin->w_cursor.lnum, 1L);
oap->end.lnum++;
vim_free(after_p);
}
}
}
else