mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-13 14:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

options: mark nonfunctional &termencoding option as hidden. #2631

Browse Source 
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>
This commit is contained in:
Björn Linse
2015-05-10 15:18:39 +02:00
parent f4423c9697
commit d9acfbd471
14 changed files with 14 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/option.c
View File

@@ -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 */