Remove termtype option

This commit is contained in:
erw7
2019-11-22 14:01:12 +09:00
committed by Björn Linse
parent c86d5fa981
commit 1e4f290691
4 changed files with 1 additions and 20 deletions

View File

@@ -313,9 +313,6 @@ static char *(p_scl_values[]) = { "yes", "no", "auto", "auto:1", "auto:2",
"auto:3", "auto:4", "auto:5", "auto:6", "auto:7", "auto:8", "auto:9",
"yes:1", "yes:2", "yes:3", "yes:4", "yes:5", "yes:6", "yes:7", "yes:8",
"yes:9", NULL };
#ifdef WIN32
static char *(p_tmt_values[]) = { "conpty", "winpty", "", NULL };
#endif
/// All possible flags for 'shm'.
static char_u SHM_ALL[] = {
@@ -3288,13 +3285,6 @@ ambw_end:
if (!parse_winhl_opt(curwin)) {
errmsg = e_invarg;
}
#ifdef WIN32
} else if (varp == &p_tmt) {
if (check_opt_strings(*varp, p_tmt_values, false) != OK
|| (!os_has_conpty_working() && STRCMP(*varp, "conpty") == 0)) {
errmsg = e_invarg;
}
#endif
} else {
// Options that are a list of flags.
p = NULL;

View File

@@ -654,7 +654,6 @@ EXTERN char_u *p_titleold; ///< 'titleold'
EXTERN char_u *p_titlestring; ///< 'titlestring'
EXTERN char_u *p_tsr; ///< 'thesaurus'
EXTERN int p_tgc; ///< 'termguicolors'
EXTERN char_u *p_tmt; ///< 'termtype'
EXTERN int p_ttimeout; ///< 'ttimeout'
EXTERN long p_ttm; ///< 'ttimeoutlen'
EXTERN char_u *p_udir; ///< 'undodir'

View File

@@ -2496,13 +2496,6 @@ return {
varname='p_tgc',
defaults={if_true={vi=false}}
},
{
full_name='termtype', abbreviation='tmt',
type='string', scope={'global'},
vi_def=false,
varname='p_tmt',
defaults={if_true={vi="",vim=""}}
},
{
full_name='terse',
type='bool', scope={'global'},

View File

@@ -56,8 +56,7 @@ int pty_process_spawn(PtyProcess *ptyproc)
assert(proc->err.closed);
int pty_type = *p_tmt;
if (pty_type != 'w' && os_has_conpty_working()) {
if (os_has_conpty_working()) {
if ((conpty_object =
os_conpty_init(&in_name, &out_name,
ptyproc->width, ptyproc->height)) != NULL) {