aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 9.1.0021: i_CTRL-R- doesn't work for multibyte chars in Replace mode

Browse Source 
Problem:  i_CTRL-R- doesn't work for multibyte chars in Replace mode,
          Coverity complains missing return value for u_save_cursor()
Solution: Use mb_charlen() and del_chars() instead, handle failure mode
          for u_save_cursor() correctly (@zeertzjq)

closes: #13846

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2024-01-12 17:43:05 +01:00
committed by Christian Brabandt
parent 4f32c83a77
commit 424ec1f235
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/register.c
View File

@@ -832,8 +832,9 @@ insert_reg(
if ((State & REPLACE_FLAG) != 0) if ((State & REPLACE_FLAG) != 0)
{ {
pos_T curpos; pos_T curpos;
u_save_cursor(); if (u_save_cursor() == FAIL)
del_bytes((long)STRLEN(y_current->y_array[0]), TRUE, FALSE); return FAIL;
del_chars((long)mb_charlen(y_current->y_array[0]), TRUE);
curpos = curwin->w_cursor; curpos = curwin->w_cursor;
if (oneright() == FAIL) if (oneright() == FAIL)
// hit end of line, need to put forward (after the current position) // hit end of line, need to put forward (after the current position)

16
src/testdir/test_registers.vim
View File

@@ -949,7 +949,7 @@ endfunc
func Test_insert_small_delete_replace_mode() func Test_insert_small_delete_replace_mode()
new new
call setline(1, ['foo', 'bar', 'foobar', 'bar']) call setline(1, ['foo', 'bar', 'foobar', 'bar'])
let @-='foo' let @- = 'foo'
call cursor(2, 1) call cursor(2, 1)
exe ":norm! R\<C-R>-\<C-R>-" exe ":norm! R\<C-R>-\<C-R>-"
call assert_equal('foofoo', getline(2)) call assert_equal('foofoo', getline(2))
@@ -960,9 +960,21 @@ func Test_insert_small_delete_replace_mode()
exe ":norm! R\<C-R>-ZZZZ" exe ":norm! R\<C-R>-ZZZZ"
call assert_equal(['foo', 'foofoo', '', 'bfoobarZZZZ'], getline(1, 4)) call assert_equal(['foo', 'foofoo', '', 'bfoobarZZZZ'], getline(1, 4))
call cursor(1, 1) call cursor(1, 1)
let @-='' let @- = ''
exe ":norm! R\<C-R>-ZZZ" exe ":norm! R\<C-R>-ZZZ"
call assert_equal(['ZZZ', 'foofoo', '', 'bfoobarZZZZ'], getline(1, 4)) call assert_equal(['ZZZ', 'foofoo', '', 'bfoobarZZZZ'], getline(1, 4))
let @- = 'βbβ'
call cursor(4, 1)
exe ":norm! R\<C-R>-"
call assert_equal(['ZZZ', 'foofoo', '', 'βbβobarZZZZ'], getline(1, 4))
let @- = 'bβb'
call cursor(4, 1)
exe ":norm! R\<C-R>-"
call assert_equal(['ZZZ', 'foofoo', '', 'bβbobarZZZZ'], getline(1, 4))
let @- = 'βbβ'
call cursor(4, 1)
exe ":norm! R\<C-R>-"
call assert_equal(['ZZZ', 'foofoo', '', 'βbβobarZZZZ'], getline(1, 4))
bwipe! bwipe!
endfunc endfunc

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 */
/**/
21,
/**/ /**/
20, 20,
/**/ /**/