adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.1322: small delete register cannot paste multi-line correctly

Browse Source 
Problem:  small delete register cannot paste multi-line correctly
          (after v8.2.2189)
Solution: caused by 032a2d050b, so make
          this logic handle charwise only (phanium)

closes: #17151

Signed-off-by: phanium <91544758+phanen@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
phanium
2025-04-18 18:32:52 +02:00
committed by Christian Brabandt
parent aee34ef23e
commit 7e93d4c617
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/register.c
View File

@ -846,7 +846,7 @@ insert_reg(
{ {
for (i = 0; i < y_current->y_size; ++i) for (i = 0; i < y_current->y_size; ++i)
{ {
if (regname == '-') if (regname == '-' && y_current->y_type == MCHAR)
{ {
int dir = BACKWARD; int dir = BACKWARD;
if ((State & REPLACE_FLAG) != 0) if ((State & REPLACE_FLAG) != 0)
@ -867,11 +867,13 @@ insert_reg(
do_put(regname, NULL, dir, 1L, PUT_CURSEND); do_put(regname, NULL, dir, 1L, PUT_CURSEND);
} }
else else
{
stuffescaped(y_current->y_array[i].string, literally); stuffescaped(y_current->y_array[i].string, literally);
// Insert a newline between lines and after last line if // Insert a newline between lines and after last line if
// y_type is MLINE. // y_type is MLINE.
if (y_current->y_type == MLINE || i < y_current->y_size - 1) if (y_current->y_type == MLINE || i < y_current->y_size - 1)
stuffcharReadbuff('\n'); stuffcharReadbuff('\n');
}
} }
} }
} }

9
src/testdir/test_registers.vim
View File

@ -1204,4 +1204,13 @@ func Test_mark_from_yank()
bw! bw!
endfunc endfunc
func Test_insert_small_delete_linewise()
new
call setline(1, ['foo'])
call cursor(1, 1)
exe ":norm! \"-cc\<C-R>-"
call assert_equal(['foo', ''], getline(1, '$'))
bwipe!
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab

2
src/version.c
View File

@ -704,6 +704,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 */
/**/
1322,
/**/ /**/
1321, 1321,
/**/ /**/