diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-01-22 23:13:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 23:13:54 +0100 |
| commit | 3308b76339ca633edb1d97718cc42051e3ff9a79 (patch) | |
| tree | 36a0991be48d1f1d3d94ab4fa65c9753c871f54d /src/nvim/eval.c | |
| parent | 84d4e4a7ef70e594cca6af96fd0967ce089f6db0 (diff) | |
| parent | 872ee4259aa0c3babcc532c2aa1ccef6f7693221 (diff) | |
| download | rneovim-3308b76339ca633edb1d97718cc42051e3ff9a79.tar.gz rneovim-3308b76339ca633edb1d97718cc42051e3ff9a79.tar.bz2 rneovim-3308b76339ca633edb1d97718cc42051e3ff9a79.zip | |
Merge #7890 'vim-patch: various'
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 28c590c0b4..f663d13c55 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -16274,8 +16274,8 @@ static void f_synconcealed(typval_T *argvars, typval_T *rettv, FunPtr fptr) // get the conceal character if ((syntax_flags & HL_CONCEAL) && curwin->w_p_cole < 3) { cchar = syn_get_sub_char(); - if (cchar == NUL && curwin->w_p_cole == 1 && lcs_conceal != NUL) { - cchar = lcs_conceal; + if (cchar == NUL && curwin->w_p_cole == 1) { + cchar = (lcs_conceal == NUL) ? ' ' : lcs_conceal; } if (cchar != NUL) { utf_char2bytes(cchar, str); @@ -20863,7 +20863,9 @@ void ex_delfunction(exarg_T *eap) if (!eap->skip) { if (fp == NULL) { - EMSG2(_(e_nofunc), eap->arg); + if (!eap->forceit) { + EMSG2(_(e_nofunc), eap->arg); + } return; } if (fp->uf_calls > 0) { |