mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-07 03:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1322: small delete register cannot paste multi-line correctly (#33531)

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

closes: vim/vim#17151

7e93d4c617
This commit is contained in:
phanium
2025-04-19 08:01:51 +08:00
committed by GitHub
parent c67398d31b
commit dca8b3fede
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/ops.c
View File

@@ -1367,7 +1367,7 @@ int insert_reg(int regname, yankreg_T *reg, bool literally_arg)
retval = FAIL; retval = FAIL;
} else { } else {
for (size_t i = 0; i < reg->y_size; i++) { for (size_t i = 0; i < reg->y_size; i++) {
if (regname == '-') { if (regname == '-' && reg->y_type == kMTCharWise) {
Direction dir = BACKWARD; Direction dir = BACKWARD;
if ((State & REPLACE_FLAG) != 0) { if ((State & REPLACE_FLAG) != 0) {
pos_T curpos; pos_T curpos;
@@ -1388,11 +1388,11 @@ int insert_reg(int regname, yankreg_T *reg, bool literally_arg)
do_put(regname, NULL, dir, 1, PUT_CURSEND); do_put(regname, NULL, dir, 1, PUT_CURSEND);
} else { } else {
stuffescaped(reg->y_array[i].data, literally); stuffescaped(reg->y_array[i].data, literally);
} // Insert a newline between lines and after last line if
// Insert a newline between lines and after last line if // y_type is kMTLineWise.
// y_type is kMTLineWise. if (reg->y_type == kMTLineWise || i < reg->y_size - 1) {
if (reg->y_type == kMTLineWise || i < reg->y_size - 1) { stuffcharReadbuff('\n');
stuffcharReadbuff('\n'); }
} }
} }
} }

9
test/old/testdir/test_registers.vim
View File

@@ -1087,4 +1087,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