Mercurial > vim

comparison src/drawline.c @ 30777:8f25424b4bfd v9.0.0723

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.0723: extra empty line below virtual text when 'list' is set Commit: https://github.com/vim/vim/commit/a9a364872e41932990aba1787af65f67c7e14917 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Oct 11 16:47:22 2022 +0100 patch 9.0.0723: extra empty line below virtual text when 'list' is set Problem: Extra empty line below virtual text when 'list' is set. Solution: Do not reset lcs_eol_one but set text_prop_follows. (closes https://github.com/vim/vim/issues/11339)
author Bram Moolenaar <Bram@vim.org>
date Tue, 11 Oct 2022 18:00:05 +0200
parents a9a46fbfd786
children 82fd47d71971
comparison
equal deleted inserted replaced
30776:f36add990584 30777:8f25424b4bfd
2015 } 2015 }
2016 2016
2017 if (lcs_eol_one < 0 && wlv.col 2017 if (lcs_eol_one < 0 && wlv.col
2018 + wlv.n_extra - 2 > wp->w_width) 2018 + wlv.n_extra - 2 > wp->w_width)
2019 // don't bail out at end of line 2019 // don't bail out at end of line
2020 lcs_eol_one = 0; 2020 text_prop_follows = TRUE;
2021 2021
2022 // When 'wrap' is off then for "below" we need 2022 // When 'wrap' is off then for "below" we need
2023 // to start a new line explictly. 2023 // to start a new line explictly.
2024 if (start_line) 2024 if (start_line)
2025 { 2025 {
2065 // If another text prop follows the condition below at 2065 // If another text prop follows the condition below at
2066 // the last window column must know. 2066 // the last window column must know.
2067 // If this is an "above" text prop and 'nowrap' the we 2067 // If this is an "above" text prop and 'nowrap' the we
2068 // must wrap anyway. 2068 // must wrap anyway.
2069 text_prop_above = above; 2069 text_prop_above = above;
2070 text_prop_follows = other_tpi != -1 2070 text_prop_follows |= other_tpi != -1
2071 && (wp->w_p_wrap 2071 && (wp->w_p_wrap
2072 || (text_props[other_tpi].tp_flags 2072 || (text_props[other_tpi].tp_flags
2073 & (TP_FLAG_ALIGN_BELOW | TP_FLAG_ALIGN_RIGHT))); 2073 & (TP_FLAG_ALIGN_BELOW | TP_FLAG_ALIGN_RIGHT)));
2074 2074
2075 if (bail_out) 2075 if (bail_out)