diff options
Diffstat (limited to 'src/nvim/misc1.c')
-rw-r--r-- | src/nvim/misc1.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c index 7f19bdf145..e752910a4b 100644 --- a/src/nvim/misc1.c +++ b/src/nvim/misc1.c @@ -1282,12 +1282,11 @@ int plines_win_nofold(win_T *wp, linenr_T lnum) return 1; col = win_linetabsize(wp, s, (colnr_T)MAXCOL); - /* - * If list mode is on, then the '$' at the end of the line may take up one - * extra column. - */ - if (wp->w_p_list && lcs_eol != NUL) + // If list mode is on, then the '$' at the end of the line may take up one + // extra column. + if (wp->w_p_list && wp->w_p_lcs_chars.eol != NUL) { col += 1; + } /* * Add column offset for 'number', 'relativenumber' and 'foldcolumn'. @@ -1336,7 +1335,8 @@ int plines_win_col(win_T *wp, linenr_T lnum, long column) // screen position of the TAB. This only fixes an error when the TAB wraps // from one screen line to the next (when 'columns' is not a multiple of // 'ts') -- webb. - if (*s == TAB && (State & NORMAL) && (!wp->w_p_list || lcs_tab1)) { + if (*s == TAB && (State & NORMAL) + && (!wp->w_p_list || wp->w_p_lcs_chars.tab1)) { col += win_lbr_chartabsize(wp, line, s, col, NULL) - 1; } |