diff options
| author | Marco Hinz <mh.codebro+github@gmail.com> | 2019-01-28 00:45:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-28 00:45:59 +0100 |
| commit | 28f87c505d895df8d00a919f6324f5305f02166e (patch) | |
| tree | 3a642b40f51833605b14a0184d968dae4bb2cdfe /src/nvim/misc1.c | |
| parent | 7e6980a161011ab58c69ee67f35522fd86e6cb25 (diff) | |
| parent | 88b0899eb40581ad5b8071823594852a7cdf2043 (diff) | |
| download | rneovim-28f87c505d895df8d00a919f6324f5305f02166e.tar.gz rneovim-28f87c505d895df8d00a919f6324f5305f02166e.tar.bz2 rneovim-28f87c505d895df8d00a919f6324f5305f02166e.zip | |
Merge #9539 "options: make 'listchars' and 'fillchars' local to window"
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; } |