Skip to content

Commit

Permalink
patch 9.0.0472: virtual text "below" doesn't show in list mode
Browse files Browse the repository at this point in the history
Problem:    Virtual text "below" doesn't show in list mode.
Solution:   Reset lcs_eol_one when displaying text property.
  • Loading branch information
brammool committed Sep 15, 2022
1 parent 12167d8 commit a4abe51
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/drawline.c
Expand Up @@ -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)
Expand Down
8 changes: 8 additions & 0 deletions 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|
3 changes: 3 additions & 0 deletions src/testdir/test_textprop.vim
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -703,6 +703,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
472,
/**/
471,
/**/
Expand Down

0 comments on commit a4abe51

Please sign in to comment.