aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval.c
diff options
context:
space:
mode:
authorMarco Hinz <mh.codebro+github@gmail.com>2019-01-28 00:45:59 +0100
committerGitHub <noreply@github.com>2019-01-28 00:45:59 +0100
commit28f87c505d895df8d00a919f6324f5305f02166e (patch)
tree3a642b40f51833605b14a0184d968dae4bb2cdfe /src/nvim/eval.c
parent7e6980a161011ab58c69ee67f35522fd86e6cb25 (diff)
parent88b0899eb40581ad5b8071823594852a7cdf2043 (diff)
downloadrneovim-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/eval.c')
-rw-r--r--src/nvim/eval.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index dcb583ce8a..3980516d32 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -16425,7 +16425,9 @@ static void f_synconcealed(typval_T *argvars, typval_T *rettv, FunPtr fptr)
if ((syntax_flags & HL_CONCEAL) && curwin->w_p_cole < 3) {
cchar = syn_get_sub_char();
if (cchar == NUL && curwin->w_p_cole == 1) {
- cchar = (lcs_conceal == NUL) ? ' ' : lcs_conceal;
+ cchar = (curwin->w_p_lcs_chars.conceal == NUL)
+ ? ' '
+ : curwin->w_p_lcs_chars.conceal;
}
if (cchar != NUL) {
utf_char2bytes(cchar, str);