aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Coudron <mcoudron@hotmail.com>2021-01-07 21:58:57 +0100
committerMatthieu Coudron <mcoudron@hotmail.com>2021-01-07 21:58:57 +0100
commit87afc90317e1da51246d625e68453d11016ae16c (patch)
tree23cba7233af260851af4ee2bd0cee0671c10484a
parentb419e39a2acc4111967023b5ce4da1ba76a888d7 (diff)
downloadrneovim-87afc90317e1da51246d625e68453d11016ae16c.tar.gz
rneovim-87afc90317e1da51246d625e68453d11016ae16c.tar.bz2
rneovim-87afc90317e1da51246d625e68453d11016ae16c.zip
screen.c: fix an issue with wrap and folds
Before this commit, a folded line would display a trailing character with bin/nvim -u ~/test.vim --cmd "hi NonText ctermbg=3" --cmd "hi Search ctermbg=2" --cmd "set listchars+=extends:X nowrap list" ~/test.txt
-rw-r--r--src/nvim/screen.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 9d515ebdb8..a78f905a70 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -4050,6 +4050,7 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow,
&& !wp->w_p_wrap
&& filler_todo <= 0
&& (wp->w_p_rl ? col == 0 : col == grid->Columns - 1)
+ && !has_fold
&& (*ptr != NUL
|| lcs_eol_one > 0
|| (n_extra && (c_extra != NUL || *p_extra != NUL)))) {