Mercurial > vim
changeset 34418:df8faa0124f7 v9.1.0132
patch 9.1.0132: "C" doesn't include composing chars with 'virtualedit'
Commit: https://github.com/vim/vim/commit/048761bcd40ec630fd3e039f0066cf4e484ceabd
Author: zeertzjq <zeertzjq@outlook.com>
Date: Sat Feb 24 14:21:39 2024 +0100
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>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 24 Feb 2024 14:30:04 +0100 |
| parents | 4720d1235967 |
| children | 6cbf38192e53 |
| files | src/ops.c src/testdir/test_virtualedit.vim src/version.c |
| diffstat | 3 files changed, 29 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ops.c +++ b/src/ops.c @@ -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; + } } /*
--- a/src/testdir/test_virtualedit.vim +++ b/src/testdir/test_virtualedit.vim @@ -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