mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-05 01:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0137: <Del> in cmdline mode doesn't delete composing chars (#27636)

Browse Source 
Problem:  <Del> in cmdline mode doesn't delete composing chars
Solution: Use mb_head_off() and mb_ptr2len() (zeertzjq)

closes: vim/vim#14095

ff2b79d239
This commit is contained in:
zeertzjq
2024-02-27 06:09:06 +08:00
committed by GitHub
parent 2ce3a9efa7
commit 0d75324e3b
4 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/ex_getln.c
View File

@@ -1510,10 +1510,8 @@ static int command_line_erase_chars(CommandLineState *s)
if (s->c == K_DEL && ccline.cmdpos != ccline.cmdlen) {
ccline.cmdpos++;
}
if (s->c == K_DEL) {
CharBoundsOff bounds = utf_cp_bounds(ccline.cmdbuff, ccline.cmdbuff + ccline.cmdpos);
ccline.cmdpos += bounds.begin_off != 0 ? bounds.end_off : 0;
ccline.cmdpos += mb_off_next(ccline.cmdbuff, ccline.cmdbuff + ccline.cmdpos);
}
if (ccline.cmdpos > 0) {

14
src/nvim/mbyte.c
View File

@@ -1884,6 +1884,20 @@ void mb_copy_char(const char **const fp, char **const tp)
*fp += l;
}
/// Return the offset from "p" to the first byte of a character. When "p" is
/// at the start of a character 0 is returned, otherwise the offset to the next
/// character. Can start anywhere in a stream of bytes.
int mb_off_next(const char *base, const char *p)
{
int head_off = utf_head_off(base, p);
if (head_off == 0) {
return 0;
}
return utfc_ptr2len(p - head_off) - head_off;
}
/// Returns the offset in bytes from "p_in" to the first and one-past-end bytes
/// of the codepoint it points to.
/// "p_in" can point anywhere in a stream of bytes.