mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
vim-patch:9.1.0132: "C" doesn't include composing chars with 'virtualedit' (#27605)
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: vim/vim#14083
048761bcd4
This commit is contained in:
parent
63c9e0c4ae
commit
febf481002
@ -1770,8 +1770,13 @@ static void mb_adjust_opend(oparg_T *oap)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
char *p = ml_get(oap->end.lnum);
|
const char *line = ml_get(oap->end.lnum);
|
||||||
oap->end.col += utf_cp_tail_off(p, p + oap->end.col);
|
const char *ptr = line + oap->end.col;
|
||||||
|
if (*ptr != NUL) {
|
||||||
|
ptr -= utf_head_off(line, ptr);
|
||||||
|
ptr += utfc_ptr2len(ptr) - 1;
|
||||||
|
oap->end.col = (colnr_T)(ptr - line);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Put character 'c' at position 'lp'
|
/// Put character 'c' at position 'lp'
|
||||||
|
@ -77,13 +77,30 @@ endfunc
|
|||||||
func Test_edit_change()
|
func Test_edit_change()
|
||||||
new
|
new
|
||||||
set virtualedit=all
|
set virtualedit=all
|
||||||
|
|
||||||
call setline(1, "\t⒌")
|
call setline(1, "\t⒌")
|
||||||
normal Cx
|
normal Cx
|
||||||
call assert_equal('x', getline(1))
|
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
|
" Do a visual block change
|
||||||
call setline(1, ['a', 'b', 'c'])
|
call setline(1, ['a', 'b', 'c'])
|
||||||
exe "normal gg3l\<C-V>2jcx"
|
exe "normal gg3l\<C-V>2jcx"
|
||||||
call assert_equal(['a x', 'b x', 'c x'], getline(1, '$'))
|
call assert_equal(['a x', 'b x', 'c x'], getline(1, '$'))
|
||||||
|
|
||||||
bwipe!
|
bwipe!
|
||||||
set virtualedit=
|
set virtualedit=
|
||||||
endfunc
|
endfunc
|
||||||
|
Loading…
Reference in New Issue
Block a user