diff options
| author | VanaIgr <vanaigranov@gmail.com> | 2024-01-25 21:50:41 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-01-25 21:58:33 +0100 |
| commit | 6638ec8afa9875ff565020536954c424d5f6f27d (patch) | |
| tree | 6b53f96435d5f448acc9c0679112d8a6b6b8fc10 | |
| parent | 78019df645400796831670ec166e7e3b55ae8310 (diff) | |
patch 9.1.0056: wrong number of trailing spaces inserted after blockwise putv9.1.0056
Problem: Incorrect number of trailing spaces inserted for multibyte
characters when pasting a blockwise register in blockwise visual
mode (VanaIgr)
Solution: Skip over trailing UTF-8 bytes when computing the number of trailing
spaces (VanaIgr)
When pasting in blockwise visual mode, and the register type is <CTRL-V>, Vim
aligns the text after the replaced area by inserting spaces after pasted
lines that are shorter than the longest line. When a shorter line contains
multibyte characters, each trailing UTF-8 byte's width is counted in addition
to the width of the character itself. Each trailing byte counts as being 4
cells wide (since it would be displayed as <xx>).
closes: #13909
Signed-off-by: VanaIgr <vanaigranov@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/register.c | 6 | ||||
| -rw-r--r-- | src/testdir/test_put.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 15 insertions, 3 deletions
diff --git a/src/register.c b/src/register.c index 8a4ae67489..3f1506a5d8 100644 --- a/src/register.c +++ b/src/register.c @@ -1903,10 +1903,10 @@ do_put( spaces = y_width + 1; init_chartabsize_arg(&cts, curwin, 0, 0, y_array[i], y_array[i]); - for (j = 0; j < yanklen; j++) + + while (*cts.cts_ptr != NUL) { - spaces -= lbr_chartabsize(&cts); - ++cts.cts_ptr; + spaces -= lbr_chartabsize_adv(&cts); cts.cts_vcol = 0; } clear_chartabsize_arg(&cts); diff --git a/src/testdir/test_put.vim b/src/testdir/test_put.vim index 72479ac7d4..559a4dccd6 100644 --- a/src/testdir/test_put.vim +++ b/src/testdir/test_put.vim @@ -12,6 +12,16 @@ func Test_put_block() bwipe! endfunc +func Test_put_block_unicode() + new + call setreg('a', "À\nÀÀ\naaaaaaaaaaaa", "\<C-V>") + call setline(1, [' 1', ' 2', ' 3']) + exe "norm! \<C-V>jj\"ap" + let expected = ['À 1', 'ÀÀ 2', 'aaaaaaaaaaaa3'] + call assert_equal(expected, getline(1, 3)) + bw! +endfunc + func Test_put_char_block() new call setline(1, ['Line 1', 'Line 2']) diff --git a/src/version.c b/src/version.c index 2a654c1d75..d06e7e99a5 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 56, +/**/ 55, /**/ 54, |