diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-11-26 15:54:03 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-11-26 15:54:03 +0300 |
| commit | b9c78130587e42ca3b6417b47fb739a166da8eb7 (patch) | |
| tree | 142cf7dd0a87dfb32a20838e7683dd1980e4b3e7 /src/nvim/option.c | |
| parent | 05a3c12118a6dae0ac8f3603f9ee4d9fd9450cce (diff) | |
| parent | 207b7ca4bc16d52641eaa5244eef25a0dba91dbc (diff) | |
| download | rneovim-b9c78130587e42ca3b6417b47fb739a166da8eb7.tar.gz rneovim-b9c78130587e42ca3b6417b47fb739a166da8eb7.tar.bz2 rneovim-b9c78130587e42ca3b6417b47fb739a166da8eb7.zip | |
Merge branch 'master' into expression-parser
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index f6f334f432..65ab7a54a6 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -115,6 +115,7 @@ static int p_bomb; static char_u *p_bh; static char_u *p_bt; static int p_bl; +static long p_channel; static int p_ci; static int p_cin; static char_u *p_cink; @@ -4193,6 +4194,9 @@ static char *set_num_option(int opt_idx, char_u *varp, long value, curbuf->b_p_imsearch = B_IMODE_NONE; } p_imsearch = curbuf->b_p_imsearch; + } else if (pp == &p_channel || pp == &curbuf->b_p_channel) { + errmsg = e_invarg; + *pp = old_value; } /* if 'titlelen' has changed, redraw the title */ else if (pp == &p_titlelen) { @@ -5472,6 +5476,7 @@ static char_u *get_varp(vimoption_T *p) case PV_BH: return (char_u *)&(curbuf->b_p_bh); case PV_BT: return (char_u *)&(curbuf->b_p_bt); case PV_BL: return (char_u *)&(curbuf->b_p_bl); + case PV_CHANNEL:return (char_u *)&(curbuf->b_p_channel); case PV_CI: return (char_u *)&(curbuf->b_p_ci); case PV_CIN: return (char_u *)&(curbuf->b_p_cin); case PV_CINK: return (char_u *)&(curbuf->b_p_cink); @@ -5773,6 +5778,7 @@ void buf_copy_options(buf_T *buf, int flags) buf->b_p_nf = vim_strsave(p_nf); buf->b_p_mps = vim_strsave(p_mps); buf->b_p_si = p_si; + buf->b_p_channel = 0; buf->b_p_ci = p_ci; buf->b_p_cin = p_cin; buf->b_p_cink = vim_strsave(p_cink); |