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.

diff --git a/src/drawline.c b/src/drawline.c
index 50d18ec97e80f51fe5a3dd7391ab4e55e1ff9f17..d958e7a89c422383b641c1f22d1ab65ba546badc 100644 (file)
--- 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)

diff --git a/src/testdir/dumps/Test_prop_text_with_padding_4.dump b/src/testdir/dumps/Test_prop_text_with_padding_4.dump
new file mode 100644 (file)
index 0000000..b0b0156
--- /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| 

diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index 8a80e5504fdcb94f1797b9ce4a2534f1772619d0..d45409ebc506a1375f8a415932be5d2fae8442ef 100644 (file)
--- 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

diff --git a/src/version.c b/src/version.c
index aa8159e820174c5c543f5dc96ff50f51a9b8b64e..77af6846179cde6dcb1ea30f3dfbcd63032ceabc 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -703,6 +703,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    472,
 /**/
     471,
 /**/