diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2015-05-10 15:18:39 +0200 |
|---|---|---|
| committer | Björn Linse <bjorn.linse@gmail.com> | 2015-05-17 18:39:25 +0200 |
| commit | d9acfbd471403a4f11ad050665633d3311a462d9 (patch) | |
| tree | 91afcb17b227c7b4c31a2c02587e0a54f968c3f2 /src/nvim/option.c | |
| parent | f4423c96973c1c35945c5be9b22331550be92ce8 (diff) | |
| download | rneovim-d9acfbd471403a4f11ad050665633d3311a462d9.tar.gz rneovim-d9acfbd471403a4f11ad050665633d3311a462d9.tar.bz2 rneovim-d9acfbd471403a4f11ad050665633d3311a462d9.zip | |
options: mark nonfunctional &termencoding option as hidden. #2631
Remove related dead code and references in the docs.
Helped-By: Michael Reed <m.reed@mykolab.com>
Helped-By: Shougo Matsushita <Shougo.Matsu@gmail.com>
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 91c8493419..9201f7b6c4 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -1501,7 +1501,7 @@ static vimoption_T (char_u *)&p_tbidi, PV_NONE, {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"termencoding", "tenc", P_STRING|P_VI_DEF|P_RCLR, - (char_u *)&p_tenc, PV_NONE, + (char_u *)NULL, PV_NONE, {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"terse", NULL, P_BOOL|P_VI_DEF, @@ -3705,7 +3705,7 @@ did_set_string_option ( errmsg = e_invarg; } /* 'encoding' and 'fileencoding' */ - else if (varp == &p_enc || gvarp == &p_fenc || varp == &p_tenc) { + else if (varp == &p_enc || gvarp == &p_fenc) { if (gvarp == &p_fenc) { if (!MODIFIABLE(curbuf) && opt_flags != OPT_GLOBAL) errmsg = e_modifiable; @@ -3738,14 +3738,6 @@ did_set_string_option ( if (varp == &p_enc && *curbuf->b_p_keymap != NUL) (void)keymap_init(); - /* When 'termencoding' is not empty and 'encoding' changes or when - * 'termencoding' changes, need to setup for keyboard input and - * display output conversion. */ - if (((varp == &p_enc && *p_tenc != NUL) || varp == &p_tenc)) { - convert_setup(&input_conv, p_tenc, p_enc); - convert_setup(&output_conv, p_enc, p_tenc); - } - } } else if (varp == &p_penc) { /* Canonize printencoding if VIM standard one */ |