summaryrefslogtreecommitdiff
path: root/src/misc1.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-02-15 20:38:25 +0100
committerBram Moolenaar <Bram@vim.org>2021-02-15 20:38:25 +0100
commiteed9d46293f0842aad0d50ff3a526f9a48b12421 (patch)
treeef3730ca3c0a7ede44fade0ea638975f43a65d5f /src/misc1.c
parent7c5b3c03699a4ab31f47c24290852d441ea8c12a (diff)
downloadvim-git-eed9d46293f0842aad0d50ff3a526f9a48b12421.tar.gz
patch 8.2.2518: 'listchars' should be window-localv8.2.2518
Problem: 'listchars' should be window-local. Solution: Make 'listchars' global-local. (Yegappan Lakshmanan, Marco Hinz, closes #5206, closes #7850)
Diffstat (limited to 'src/misc1.c')
-rw-r--r--src/misc1.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/misc1.c b/src/misc1.c
index 010622ee5..a72dc9bf2 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -403,7 +403,7 @@ plines_win_nofold(win_T *wp, linenr_T lnum)
* 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 (wp->w_p_list && wp->w_lcs_chars.eol != NUL)
col += 1;
/*
@@ -460,7 +460,8 @@ plines_win_col(win_T *wp, linenr_T lnum, long column)
* 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_lcs_chars.tab1))
col += win_lbr_chartabsize(wp, line, s, (colnr_T)col, NULL) - 1;
/*