Skip to content

Commit a4abe51

Browse files
committed
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.
1 parent 12167d8 commit a4abe51

File tree

4 files changed

+18
-0
lines changed

4 files changed

+18
-0
lines changed

src/drawline.c

+5
Original file line numberDiff line numberDiff line change
@@ -1888,6 +1888,11 @@ win_line(
18881888
p_extra_free2 = wlv.p_extra;
18891889
}
18901890

1891+
if (lcs_eol_one < 0 && wlv.col
1892+
+ wlv.n_extra - 2 > wp->w_width)
1893+
// don't bail out at end of line
1894+
lcs_eol_one = 0;
1895+
18911896
// When 'wrap' is off then for "below" we need
18921897
// to start a new line explictly.
18931898
if (start_line)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
>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
2+
@47|r+0&#ffd7ff255|i|g|h|t| |a|l|i|g|n|e|d
3+
| +0&#ffffff0@3|b+0&#ffd7ff255|e|l|o|w| |t|h|e| |l|i|n|e| +0&#ffffff0@41
4+
|s|e|c|o|n|d| |l|i|n|e|$+0#4040ff13&| +0#0000000&@47
5+
|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
6+
@51|r+0&#ffd7ff255|i|g|h|t|m|o|s|t
7+
| +0&#ffffff0@59
8+
|:|s|e|t| |l|i|s|t| @32|1|,|1| @10|A|l@1|

src/testdir/test_textprop.vim

+3
Original file line numberDiff line numberDiff line change
@@ -3181,6 +3181,9 @@ func Test_insert_text_with_padding()
31813181
call term_sendkeys(buf, "ggix\<Esc>")
31823182
call VerifyScreenDump(buf, 'Test_prop_text_with_padding_3', {})
31833183

3184+
call term_sendkeys(buf, ":set list\<CR>")
3185+
call VerifyScreenDump(buf, 'Test_prop_text_with_padding_4', {})
3186+
31843187
call StopVimInTerminal(buf)
31853188
call delete('XscriptPropsPadded')
31863189
endfunc

src/version.c

+2
Original file line numberDiff line numberDiff line change
@@ -703,6 +703,8 @@ static char *(features[]) =
703703

704704
static int included_patches[] =
705705
{ /* Add new patch number below this line */
706+
/**/
707+
472,
706708
/**/
707709
471,
708710
/**/

0 commit comments

Comments
 (0)