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/charset.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/charset.c')
| -rw-r--r-- | src/nvim/charset.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/charset.c b/src/nvim/charset.c index 4b192e7e94..08ecff149c 100644 --- a/src/nvim/charset.c +++ b/src/nvim/charset.c @@ -749,8 +749,8 @@ int vim_strnsize(char_u *s, int len) /// /// @return Number of characters. #define RET_WIN_BUF_CHARTABSIZE(wp, buf, p, col) \ - if (*(p) == TAB && (!(wp)->w_p_list || lcs_tab1)) { \ - const int ts = (int) (buf)->b_p_ts; \ + if (*(p) == TAB && (!(wp)->w_p_list || wp->w_p_lcs_chars.tab1)) { \ + const int ts = (int)(buf)->b_p_ts; \ return (ts - (int)(col % ts)); \ } else { \ return ptr2cells(p); \ @@ -1149,7 +1149,7 @@ static int win_nolbr_chartabsize(win_T *wp, char_u *s, colnr_T col, int *headp) { int n; - if ((*s == TAB) && (!wp->w_p_list || lcs_tab1)) { + if ((*s == TAB) && (!wp->w_p_list || wp->w_p_lcs_chars.tab1)) { n = (int)wp->w_buffer->b_p_ts; return n - (col % n); } @@ -1241,7 +1241,7 @@ void getvcol(win_T *wp, pos_T *pos, colnr_T *start, colnr_T *cursor, // When 'list', 'linebreak', 'showbreak' and 'breakindent' are not set // use a simple loop. // Also use this when 'list' is set but tabs take their normal size. - if ((!wp->w_p_list || (lcs_tab1 != NUL)) + if ((!wp->w_p_list || (wp->w_p_lcs_chars.tab1 != NUL)) && !wp->w_p_lbr && (*p_sbr == NUL) && !wp->w_p_bri ) { |