Mercurial > vim
changeset 30273:5f112a0b4da1 v9.0.0472
patch 9.0.0472: virtual text "below" doesn't show in list mode
Commit: https://github.com/vim/vim/commit/a4abe514ecd9b7a038feed89f48476809775c80f
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Sep 15 19:44:09 2022 +0100
patch 9.0.0472: virtual text "below" doesn't show in list mode
Problem: Virtual text "below" doesn't show in list mode.
Solution: Reset lcs_eol_one when displaying text property.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 15 Sep 2022 20:45:03 +0200 |
parents | 200a2586dc4d |
children | 76745af3bb76 |
files | src/drawline.c src/testdir/dumps/Test_prop_text_with_padding_4.dump src/testdir/test_textprop.vim src/version.c |
diffstat | 4 files changed, 18 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/drawline.c +++ b/src/drawline.c @@ -1888,6 +1888,11 @@ win_line( p_extra_free2 = wlv.p_extra; } + if (lcs_eol_one < 0 && wlv.col + + wlv.n_extra - 2 > wp->w_width) + // don't bail out at end of line + lcs_eol_one = 0; + // When 'wrap' is off then for "below" we need // to start a new line explictly. if (start_line)
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_prop_text_with_padding_4.dump @@ -0,0 +1,8 @@ +>x+0&#ffffff0@10|S|o|m|e| |t|e|x|t| |t|o| |a|d@1| |v|i|r|t|u|a|l| |t|e|x|t| |t|o|.|$+0#4040ff13&| +0#0000000&@2|a+0&#ffd7ff255|f|t|e|r| +0&#ffffff0@6 +@47|r+0&#ffd7ff255|i|g|h|t| |a|l|i|g|n|e|d +| +0&#ffffff0@3|b+0&#ffd7ff255|e|l|o|w| |t|h|e| |l|i|n|e| +0&#ffffff0@41 +|s|e|c|o|n|d| |l|i|n|e|$+0#4040ff13&| +0#0000000&@47 +|x|A|n|o|t|h|e|r| |l|i|n|e| |w|i|t|h| |s|o|m|e| |t|e|x|t| |t|o| |m|a|k|e| |t|h|e| |w|r|a|p|.|$+0#4040ff13&| +0#0000000&@12 +@51|r+0&#ffd7ff255|i|g|h|t|m|o|s|t +| +0&#ffffff0@59 +|:|s|e|t| |l|i|s|t| @32|1|,|1| @10|A|l@1|
--- a/src/testdir/test_textprop.vim +++ b/src/testdir/test_textprop.vim @@ -3181,6 +3181,9 @@ func Test_insert_text_with_padding() call term_sendkeys(buf, "ggix\<Esc>") call VerifyScreenDump(buf, 'Test_prop_text_with_padding_3', {}) + call term_sendkeys(buf, ":set list\<CR>") + call VerifyScreenDump(buf, 'Test_prop_text_with_padding_4', {}) + call StopVimInTerminal(buf) call delete('XscriptPropsPadded') endfunc