diff options
| author | Luuk van Baal <luukvbaal@gmail.com> | 2023-04-27 02:54:51 +0200 |
|---|---|---|
| committer | Luuk van Baal <luukvbaal@gmail.com> | 2023-05-02 13:11:47 +0200 |
| commit | 72c525d5675bc017fa52bcc74a394db7d01e6359 (patch) | |
| tree | 94c69643a2bccc47af5ab6034482019d952b98a1 /src/nvim | |
| parent | 6146400605af93ac48dae4393569c44e8a2e39d2 (diff) | |
| download | rneovim-72c525d5675bc017fa52bcc74a394db7d01e6359.tar.gz rneovim-72c525d5675bc017fa52bcc74a394db7d01e6359.tar.bz2 rneovim-72c525d5675bc017fa52bcc74a394db7d01e6359.zip | |
vim-patch:9.0.0758: "precedes" from 'listchars' overwritten by <<<
Problem: "precedes" from 'listchars' overwritten by <<< for 'smoothscroll'.
Solution: Keep the "precedes" character.
https://github.com/vim/vim/commit/13cdde39520220bb856cba16626327c706752b51
Co-authored-by: Bram Moolenaar <Bram@vim.org>
Diffstat (limited to 'src/nvim')
| -rw-r--r-- | src/nvim/grid.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/nvim/grid.c b/src/nvim/grid.c index 8431c078b9..9e830413bd 100644 --- a/src/nvim/grid.c +++ b/src/nvim/grid.c @@ -530,9 +530,12 @@ void grid_put_linebuf(ScreenGrid *grid, int row, int coloff, int endcol, int cle max_off_from = linebuf_size; max_off_to = grid->line_offset[row] + (size_t)grid->cols; - if (topline && wp->w_skipcol > 0 && *get_showbreak_value(wp) == NUL) { - // Take care of putting "<<<" on the first line for 'smoothscroll' - // when 'showbreak' is not set. + // Take care of putting "<<<" on the first line for 'smoothscroll'. + if (topline && wp->w_skipcol > 0 + // do not overwrite the 'showbreak' text with "<<<" + && *get_showbreak_value(wp) == NUL + // do not overwrite the 'listchars' "precedes" text with "<<<" + && !(wp->w_p_list && wp->w_p_lcs_chars.prec != 0)) { int off = 0; int skip = 0; if (wp->w_p_nu && wp->w_p_rnu) { |