thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.0725: virtual text "after" wraps to next line when 'wrap' is off

Browse Source 
Problem:    Virtual text "after" wraps to next line even when 'wrap' is off
            and 'list' is set.
Solution:   Do not use the minimum width when 'wrap' is off. (issue #11336)
This commit is contained in:
Bram Moolenaar
2022-10-11 21:02:09 +01:00
parent a275f2cdcc
commit 7e017461e2
4 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/drawline.c
View File

@@ -583,8 +583,9 @@ textprop_size_after_trunc(
int strsize = 0;
int n_used;
// if the remaining size is to small wrap anyway and use the next line
if (space < PROP_TEXT_MIN_CELLS)
// if the remaining size is to small and 'wrap' is set we wrap anyway and
// use the next line
if (space < PROP_TEXT_MIN_CELLS && wp->w_p_wrap)
space += wp->w_width;
if (flags & (TP_FLAG_ALIGN_BELOW | TP_FLAG_ALIGN_ABOVE))
space -= padding;
@@ -658,7 +659,8 @@ text_prop_position(
? (col_with_padding <= col_off || !wp->w_p_wrap)
: (n_used < *n_extra)))
{
if (right && (wrap || room < PROP_TEXT_MIN_CELLS))
if (right && (wrap
|| (room < PROP_TEXT_MIN_CELLS && wp->w_p_wrap)))
{
// right-align on next line instead of wrapping if possible
before = wp->w_width - col_off - strsize + room;