0
0
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00

patch 9.0.0723: extra empty line below virtual text when 'list' is set

Problem:    Extra empty line below virtual text when 'list' is set.
Solution:   Do not reset lcs_eol_one but set text_prop_follows. (closes #11339)
This commit is contained in:
Bram Moolenaar
2022-10-11 16:47:22 +01:00
parent 877151b3d8
commit a9a364872e
4 changed files with 15 additions and 2 deletions

View File

@@ -2017,7 +2017,7 @@ win_line(
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;
text_prop_follows = TRUE;
// When 'wrap' is off then for "below" we need
// to start a new line explictly.
@@ -2067,7 +2067,7 @@ win_line(
// If this is an "above" text prop and 'nowrap' the we
// must wrap anyway.
text_prop_above = above;
text_prop_follows = other_tpi != -1
text_prop_follows |= other_tpi != -1
&& (wp->w_p_wrap
|| (text_props[other_tpi].tp_flags
& (TP_FLAG_ALIGN_BELOW | TP_FLAG_ALIGN_RIGHT)));

View File

@@ -0,0 +1,8 @@
|f+0&#ffffff0|i|r|s|t| |l|i|n|e|$+0#4040ff13&| +0#0000000&@48
@3|a+0&#ffd7ff255|f|t|e|r| |a|f|t|e|r| |a|f|t|e|r| |a|f|t|e|r| |a|f|t|e|r| |a|f|t|e|r| |a|f|t|e|r| |a|f|t|e|r| |a|f|t|e|r| |a|f|…
| +0&#ffffff0@29|m+0&#ffd7ff255|o|r|e| |m|o|r|e| |m|o|r|e| |m|o|r|e| |m|o|r|e| |m|o|r|e|…
|s+0&#ffffff0|e|c|o|n|d| >l|i|n|e|$+0#4040ff13&| +0#0000000&@47
|~+0#4040ff13&| @58
|~| @58
|~| @58
|:+0#0000000&|s|e|t| |l|i|s|t| @32|2|,|8| @10|A|l@1|

View File

@@ -3256,6 +3256,9 @@ func Test_long_text_below_with_padding()
let buf = RunVimInTerminal('-S XlongTextBelowWithPadding', #{rows: 8, cols: 60})
call VerifyScreenDump(buf, 'Test_long_text_with_padding_1', {})
call term_sendkeys(buf, ":set list\<CR>")
call VerifyScreenDump(buf, 'Test_long_text_with_padding_2', {})
call StopVimInTerminal(buf)
endfunc

View File

@@ -699,6 +699,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
723,
/**/
722,
/**/