diff --git a/src/register.c b/src/register.c index 267e0fcc43..9d27706698 100644 --- a/src/register.c +++ b/src/register.c @@ -846,7 +846,7 @@ insert_reg( { for (i = 0; i < y_current->y_size; ++i) { - if (regname == '-') + if (regname == '-' && y_current->y_type == MCHAR) { int dir = BACKWARD; if ((State & REPLACE_FLAG) != 0) @@ -867,11 +867,13 @@ insert_reg( do_put(regname, NULL, dir, 1L, PUT_CURSEND); } else + { stuffescaped(y_current->y_array[i].string, literally); - // Insert a newline between lines and after last line if - // y_type is MLINE. - if (y_current->y_type == MLINE || i < y_current->y_size - 1) - stuffcharReadbuff('\n'); + // Insert a newline between lines and after last line if + // y_type is MLINE. + if (y_current->y_type == MLINE || i < y_current->y_size - 1) + stuffcharReadbuff('\n'); + } } } } diff --git a/src/testdir/test_registers.vim b/src/testdir/test_registers.vim index 981f9d227e..b597ab326e 100644 --- a/src/testdir/test_registers.vim +++ b/src/testdir/test_registers.vim @@ -1204,4 +1204,13 @@ func Test_mark_from_yank() bw! endfunc +func Test_insert_small_delete_linewise() + new + call setline(1, ['foo']) + call cursor(1, 1) + exe ":norm! \"-cc\-" + call assert_equal(['foo', ''], getline(1, '$')) + bwipe! +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index 4c9f4ce53d..4990e4475c 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1322, /**/ 1321, /**/