diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 02:10:59 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 02:10:59 +0000 |
commit | cccb21df3b4c6fe0aaa99743c418aa973aeebad0 (patch) | |
tree | 35a2d1f88d47e930fec425da1c1cb89b3ccae6e0 /src/textprop.c | |
parent | Releasing progress-linux version 2:9.1.0199-1~progress7.99u1. (diff) | |
download | vim-cccb21df3b4c6fe0aaa99743c418aa973aeebad0.tar.xz vim-cccb21df3b4c6fe0aaa99743c418aa973aeebad0.zip |
Merging upstream version 2:9.1.0374.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | src/textprop.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/textprop.c b/src/textprop.c index a976570..83c42a3 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) |