patch 9.0.1124: virtual text at a column position is truncated

Problem:    Virtual text at a column position is truncated at the window edge.
            (Yegappan Lakshmanan)
Solution:   Do not truncated virtual text that is placed at a column.

diff --git a/src/drawline.c b/src/drawline.c
index d8dc303e312eeb7c8e2b2ecda969d2fc17492985..11cfb7782ffb381e6ec720eda2c64230d3921b82 100644 (file)
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -643,7 +643,7 @@ text_prop_position(
     int            right = (tp->tp_flags & TP_FLAG_ALIGN_RIGHT);
     int            above = (tp->tp_flags & TP_FLAG_ALIGN_ABOVE);
     int            below = (tp->tp_flags & TP_FLAG_ALIGN_BELOW);
-    int            wrap = (tp->tp_flags & TP_FLAG_WRAP);
+    int            wrap = tp->tp_col < MAXCOL || (tp->tp_flags & TP_FLAG_WRAP);
     int            padding = tp->tp_col == MAXCOL && tp->tp_len > 1
                                                          ? tp->tp_len - 1 : 0;
     int            col_with_padding = scr_col + (below ? 0 : padding);

diff --git a/src/testdir/dumps/Test_prop_with_wrap_1.dump b/src/testdir/dumps/Test_prop_with_wrap_1.dump
index c4bf86683bc17babe72492cd247deb4094ecadaa..6b6d66470a5bb0e985eb37b7e14a550e599a6c78 100644 (file)
--- a/src/testdir/dumps/Test_prop_with_wrap_1.dump
+++ b/src/testdir/dumps/Test_prop_with_wrap_1.dump
@@ -1,6 +1,6 @@
->a+0&#ffffff0|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|s+0#e000e06&|o|m|e| |v|i|…
-|d+0#0000000&|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| @17
+|a+0&#ffffff0|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|s+0#e000e06&|o|m|e| |v|i|r
+|t|u|a|l| |t|e|x|t|d+0#0000000&|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f> @8
 |~+0#4040ff13&| @48
 |~| @48
 |~| @48
-| +0#0000000&@31|1|,|1| @10|A|l@1| 
+| +0#0000000&@31|1|,|7|5|-|9|2| @6|A|l@1| 

diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index a507a952cfb2b24c09cf268bb4bac8bb032fd251..f1c79845a533236ccd1269388f96a4e423c7f81c 100644 (file)
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -1978,6 +1978,7 @@ func Test_prop_with_wrap()
       setline(1, 'asdf '->repeat(15))
       prop_type_add('test', {highlight: 'Special'})
       prop_add(1, 43, {text: 'some virtual text', type: 'test'})
+      normal G$
   END
   call writefile(lines, 'XscriptPropWithWrap', 'D')
   let buf = RunVimInTerminal('-S XscriptPropWithWrap', #{rows: 6, cols: 50})

diff --git a/src/version.c b/src/version.c
index 531d7bc3f0e86f8d65e0ffc04f2902c59b2d05fa..b49d71d8c8f4d5c0291f74716c92af62f8518db6 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1124,
 /**/
     1123,
 /**/