mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-29 06:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1083: setreg() doesn't correctly handle mbyte chars in blockwise mode

Browse Source 
Problem:  setreg() doesn't correctly handle mbyte chars in blockwise
          mode
Solution: use mb_ptr2len_len function pointer (Yee Cheng Chin)

setreg() will automatically calculate the width when a blockwise mode is
specified, but it does not properly calculate the line widths of mbyte
characters when value is passed as newline-terminated string. It does
work when value is passed as a list of lines though.

Fix this by properly using the mbyte function pointer to increment the
loop counter.

closes: vim/vim#16596

a17f8bfb28

Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>
This commit is contained in:
zeertzjq
2025-02-09 08:30:58 +08:00
parent 00bce2723f
commit 6f0a91579f
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/ops.c
View File

@@ -5248,14 +5248,21 @@ static void str_to_reg(yankreg_T *y_ptr, MotionType yank_type, const char *str,
start < end + extraline;
start += line_len + 1, lnum++) {
int charlen = 0;
const char *line_end;
for (line_end = start; line_end < end; line_end++) {
const char *line_end = start;
while (line_end < end) { // find the end of the line
if (*line_end == '\n') {
break;
}
if (yank_type == kMTBlockWise) {
charlen += utf_ptr2cells_len(line_end, (int)(end - line_end));
}
if (*line_end == NUL) {
line_end++; // registers can have NUL chars
} else {
line_end += utf_ptr2len_len(line_end, (int)(end - line_end));
}
}
assert(line_end - start >= 0);
line_len = (size_t)(line_end - start);