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

updated for version 7.4.034

Browse Source 
Problem:    Using "p" in Visual block mode only changes the first line.
Solution:   Repeat the put in all text in the block. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2013-09-22 15:23:44 +02:00
parent 6848c8b561
commit ec11aef914
6 changed files with 55 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/ops.c
View File

@@ -3776,25 +3776,42 @@ do_put(regname, dir, count, flags)
*/
if (y_type == MCHAR && y_size == 1)
{
totlen = count * yanklen;
if (totlen)
{
oldp = ml_get(lnum);
newp = alloc_check((unsigned)(STRLEN(oldp) + totlen + 1));
if (newp == NULL)
goto end; /* alloc() will give error message */
mch_memmove(newp, oldp, (size_t)col);
ptr = newp + col;
for (i = 0; i < count; ++i)
do {
totlen = count * yanklen;
if (totlen > 0)
{
mch_memmove(ptr, y_array[0], (size_t)yanklen);
ptr += yanklen;
oldp = ml_get(lnum);
newp = alloc_check((unsigned)(STRLEN(oldp) + totlen + 1));
if (newp == NULL)
goto end; /* alloc() gave an error message */
mch_memmove(newp, oldp, (size_t)col);
ptr = newp + col;
for (i = 0; i < count; ++i)
{
mch_memmove(ptr, y_array[0], (size_t)yanklen);
ptr += yanklen;
}
STRMOVE(ptr, oldp + col);
ml_replace(lnum, newp, FALSE);
/* Place cursor on last putted char. */
if (lnum == curwin->w_cursor.lnum)
curwin->w_cursor.col += (colnr_T)(totlen - 1);
}
STRMOVE(ptr, oldp + col);
ml_replace(lnum, newp, FALSE);
/* Put cursor on last putted char. */
curwin->w_cursor.col += (colnr_T)(totlen - 1);
}
#ifdef FEAT_VISUAL
if (VIsual_active)
lnum++;
#endif
} while (
#ifdef FEAT_VISUAL
VIsual_active && lnum <= curbuf->b_visual.vi_end.lnum
#else
FALSE /* stop after 1 paste */
#endif
);
#ifdef FEAT_VISUAL
VIsual_active = FALSE;
#endif
curbuf->b_op_end = curwin->w_cursor;
/* For "CTRL-O p" in Insert mode, put cursor after last char */
if (totlen && (restart_edit != 0 || (flags & PUT_CURSEND)))