diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-10-10 21:10:03 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-10-10 21:10:03 +0100 |
| commit | ccf2837a05cef0ea4913ebff4f2f6000bc050271 (patch) | |
| tree | 8b6923e28dd3fa10392f4c342ced3445c4121c2a | |
| parent | d3283fba2593d093593fc692702aabfaa2a68523 (diff) | |
| download | vim-git-9.0.0718.tar.gz | |
patch 9.0.0718: extra empty line between two virtual text "below"v9.0.0718
Problem: Extra empty line between two virtual text "below" when 'wrap' and
'number' are set.
Solution: Reset "before" when there is no text in the screen line.
(closes #11334)
| -rw-r--r-- | src/drawline.c | 4 | ||||
| -rw-r--r-- | src/testdir/dumps/Test_prop_with_text_after_below_trunc_2.dump | 8 | ||||
| -rw-r--r-- | src/testdir/test_textprop.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 15 insertions, 2 deletions
diff --git a/src/drawline.c b/src/drawline.c index 3d8b02ebe..bc1b20a19 100644 --- a/src/drawline.c +++ b/src/drawline.c @@ -639,7 +639,7 @@ text_prop_position( if (wrap || right || above || below || padding > 0 || n_used < *n_extra) { - int col_off = win_col_off(wp) + win_col_off2(wp); + int col_off = win_col_off(wp) - win_col_off2(wp); int skip_add = 0; if (above) @@ -655,7 +655,7 @@ text_prop_position( if (before < 0 || !(right || below) || (below - ? (col_with_padding == 0 || !wp->w_p_wrap) + ? (col_with_padding <= col_off || !wp->w_p_wrap) : (n_used < *n_extra))) { if (right && (wrap || room < PROP_TEXT_MIN_CELLS)) diff --git a/src/testdir/dumps/Test_prop_with_text_after_below_trunc_2.dump b/src/testdir/dumps/Test_prop_with_text_after_below_trunc_2.dump new file mode 100644 index 000000000..1d93f9fb4 --- /dev/null +++ b/src/testdir/dumps/Test_prop_with_text_after_below_trunc_2.dump @@ -0,0 +1,8 @@ +| +0#af5f00255#ffffff0@1|1| |o+0#0000000&|n|a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d|f| |a|s|d| |f|a|s| |d|f|t+0#e000e06&|h|e| |q|u|i|c|k| |b|r|o|w|n| |f|o|x| |j|u|m|… +| +0#af5f00255&@3|t+0#e000e06&|h|e| |q|u|i|c|k| |b|r|o|w|n| |f|o|x| |j|u|m|p|s| |o|v|e|r| |t|h|e| |l|a|z|y| |d|o|g| +0#0000000&@12 +| +0#af5f00255&@1|2| |t+0#0000000&|w>o| @52 +|~+0#4040ff13&| @58 +|~| @58 +|~| @58 +|~| @58 +|:+0#0000000&|s|e|t| |n|u|m|b|e|r| @30|2|,|3| @10|A|l@1| diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim index b4178e5f2..3fb27c9a6 100644 --- a/src/testdir/test_textprop.vim +++ b/src/testdir/test_textprop.vim @@ -2653,6 +2653,9 @@ func Test_props_with_text_after_below_trunc() let buf = RunVimInTerminal('-S XscriptPropsAfterTrunc', #{rows: 8, cols: 60}) call VerifyScreenDump(buf, 'Test_prop_with_text_after_below_trunc_1', {}) + call term_sendkeys(buf, ":set number\<CR>") + call VerifyScreenDump(buf, 'Test_prop_with_text_after_below_trunc_2', {}) + call StopVimInTerminal(buf) endfunc diff --git a/src/version.c b/src/version.c index f33673e15..ac3b56791 100644 --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 718, +/**/ 717, /**/ 716, |