diff options
| -rw-r--r-- | src/testdir/test_textprop.vim | 8 | ||||
| -rw-r--r-- | src/textprop.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 11 deletions
diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim index 61e5158782..2bf28349d7 100644 --- a/src/testdir/test_textprop.vim +++ b/src/testdir/test_textprop.vim @@ -3083,12 +3083,12 @@ func Test_props_with_text_truncated_just_before_after() ]) prop_type_add("test", {"highlight": "Error"}) - prop_add(1, 0, {type: "test", text: "after text", text_padding_left: 1}) + prop_add(1, 0, {type: "test", text_align: "right", text: "right text"}) def g:AddPropBelow() prop_add(1, 0, {type: "test", text_align: "below", text: "below text"}) enddef - def g:AddPropRight() - prop_add(1, 0, {type: "test", text_align: "right", text: "right text"}) + def g:AddPropAfter() + prop_add(1, 0, {type: "test", text: "after text", text_padding_left: 1}) enddef normal G$ END @@ -3099,7 +3099,7 @@ func Test_props_with_text_truncated_just_before_after() call term_sendkeys(buf, ":call AddPropBelow()\<CR>") call VerifyScreenDump(buf, 'Test_props_with_text_truncated_just_before_after_2', {}) - call term_sendkeys(buf, ":call AddPropRight()\<CR>:\<Esc>") + call term_sendkeys(buf, ":call AddPropAfter()\<CR>:\<Esc>") call VerifyScreenDump(buf, 'Test_props_with_text_truncated_just_before_after_2', {}) call StopVimInTerminal(buf) diff --git a/src/textprop.c b/src/textprop.c index a976570189..83c42a371c 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -672,16 +672,10 @@ prop_count_above_below(buf_T *buf, linenr_T lnum) mch_memmove(&prop, props + i * sizeof(prop), sizeof(prop)); if (prop.tp_col == MAXCOL && text_prop_type_valid(buf, &prop)) { - if ((prop.tp_flags & TP_FLAG_ALIGN_BELOW) + if ((prop.tp_flags & (TP_FLAG_ALIGN_ABOVE | TP_FLAG_ALIGN_BELOW)) || (next_right_goes_below && (prop.tp_flags & TP_FLAG_ALIGN_RIGHT))) { - next_right_goes_below = TRUE; - ++result; - } - else if (prop.tp_flags & TP_FLAG_ALIGN_ABOVE) - { - next_right_goes_below = FALSE; ++result; } else if (prop.tp_flags & TP_FLAG_ALIGN_RIGHT) diff --git a/src/version.c b/src/version.c index 7176d67b06..dc373bc28b 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 224, +/**/ 223, /**/ 222, |