diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-09-21 23:48:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-21 23:48:08 -0700 |
| commit | c534ab84474a111ce969b69aba137ee63849cbb9 (patch) | |
| tree | 228dc1a75cc165895eed875cf9f03ef0851671cc /src/nvim/screen.c | |
| parent | 45447e3b647259d78434798ddd9c2ae245dcdbcc (diff) | |
| parent | 16549324988be0717b59f7e5fec818ee9ad70f52 (diff) | |
| download | rneovim-c534ab84474a111ce969b69aba137ee63849cbb9.tar.gz rneovim-c534ab84474a111ce969b69aba137ee63849cbb9.tar.bz2 rneovim-c534ab84474a111ce969b69aba137ee63849cbb9.zip | |
Merge #11034 from zwegner/precedes
Fix "precedes" listchar behavior in wrap mode
Diffstat (limited to 'src/nvim/screen.c')
| -rw-r--r-- | src/nvim/screen.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index f4aa10ecf5..a866901b78 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -3756,14 +3756,12 @@ win_line ( char_attr = hl_combine_attr(char_attr, extra_attr); } - /* - * Handle the case where we are in column 0 but not on the first - * character of the line and the user wants us to show us a - * special character (via 'listchars' option "precedes:<char>". - */ + // Handle the case where we are in column 0 but not on the first + // character of the line and the user wants us to show us a + // special character (via 'listchars' option "precedes:<char>". if (lcs_prec_todo != NUL && wp->w_p_list - && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) + && (wp->w_p_wrap ? (wp->w_skipcol > 0 && row == 0) : wp->w_leftcol > 0) && filler_todo <= 0 && draw_state > WL_NR && c != NUL) { |