0
0
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00

patch 9.1.0132: "C" doesn't include composing chars with 'virtualedit'

Problem:  using "C" and 've=all' set, doesn't include composing chars
          when changing a line, keeps the composing chars for whatever
          is typed afterwards.
Solution: Use mb_head_off() and mb_ptr2len() instead of mb_tail_off().
          (zeertzjq)

closes: #14083

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq 2024-02-24 14:21:39 +01:00 committed by Christian Brabandt
parent 0dc0bff000
commit 048761bcd4
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
3 changed files with 29 additions and 3 deletions

View File

@ -990,13 +990,20 @@ setmarks:
static void
mb_adjust_opend(oparg_T *oap)
{
char_u *p;
char_u *line;
char_u *ptr;
if (!oap->inclusive)
return;
p = ml_get(oap->end.lnum);
oap->end.col += mb_tail_off(p, p + oap->end.col);
line = ml_get(oap->end.lnum);
ptr = line + oap->end.col;
if (*ptr != NUL)
{
ptr -= (*mb_head_off)(line, ptr);
ptr += (*mb_ptr2len)(ptr) - 1;
oap->end.col = ptr - line;
}
}
/*

View File

@ -77,13 +77,30 @@ endfunc
func Test_edit_change()
new
set virtualedit=all
call setline(1, "\t⒌")
normal Cx
call assert_equal('x', getline(1))
call setline(1, "\ta̳")
normal Cx
call assert_equal('x', getline(1))
call setline(1, "\tβ̳")
normal Cx
call assert_equal('x', getline(1))
if has('arabic')
call setline(1, "\tلا")
normal Cx
call assert_equal('x', getline(1))
endif
" Do a visual block change
call setline(1, ['a', 'b', 'c'])
exe "normal gg3l\<C-V>2jcx"
call assert_equal(['a x', 'b x', 'c x'], getline(1, '$'))
bwipe!
set virtualedit=
endfunc

View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
132,
/**/
131,
/**/