aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-10-05 06:48:40 +0800
committerzeertzjq <zeertzjq@outlook.com>2022-10-05 06:59:05 +0800
commit98bb2c19309ced1131afce4fc2cdae518d0a2dcd (patch)
treecedc2681f83934bc007134b862f24d1bc41bec0c
parentddc363dce9020bce7d5bd931929f0d11cc87ad6d (diff)
downloadrneovim-98bb2c19309ced1131afce4fc2cdae518d0a2dcd.tar.gz
rneovim-98bb2c19309ced1131afce4fc2cdae518d0a2dcd.tar.bz2
rneovim-98bb2c19309ced1131afce4fc2cdae518d0a2dcd.zip
vim-patch:9.0.0661: multi-byte "lastline" in 'fillchars' does not work properly
Problem: Multi-byte "lastline" item in 'fillchars' does not work properly when the window is two columns wide. Solution: Compute the text length correctly. (closes vim/vim#11280) https://github.com/vim/vim/commit/18b3500b8c517e44c23197e558aa36aed1c6916c
-rw-r--r--src/nvim/testdir/test_display.vim4
-rw-r--r--test/functional/legacy/display_spec.lua15
2 files changed, 19 insertions, 0 deletions
diff --git a/src/nvim/testdir/test_display.vim b/src/nvim/testdir/test_display.vim
index 0962429f71..13796449ab 100644
--- a/src/nvim/testdir/test_display.vim
+++ b/src/nvim/testdir/test_display.vim
@@ -435,6 +435,10 @@ func Run_Test_display_lastline(euro)
call term_sendkeys(buf, ":3split\<CR>")
call VerifyScreenDump(buf, $'Test_display_lastline_{a:euro}5', {})
+ call term_sendkeys(buf, ":close\<CR>")
+ call term_sendkeys(buf, ":2vsplit\<CR>")
+ call VerifyScreenDump(buf, $'Test_display_lastline_{a:euro}6', {})
+
call StopVimInTerminal(buf)
endfunc
diff --git a/test/functional/legacy/display_spec.lua b/test/functional/legacy/display_spec.lua
index 28dbb4bc2e..9160129a02 100644
--- a/test/functional/legacy/display_spec.lua
+++ b/test/functional/legacy/display_spec.lua
@@ -125,6 +125,21 @@ describe('display', function()
{3:[No Name] [+] }|
|
]]):gsub('@', fillchar)))
+
+ command('close')
+ command('2vsplit')
+ screen:expect((([[
+ ^aa│aaa |
+ a │bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
+ bb│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
+ bb│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
+ bb│{1:~ }|
+ bb│{1:~ }|
+ bb│{1:~ }|
+ {1:@@}│{1:~ }|
+ {2:< }{3:[No Name] [+] }|
+ |
+ ]]):gsub('@', fillchar)))
end
-- oldtest: Test_display_lastline()