diff options
| -rw-r--r-- | src/nvim/option.c | 10 | ||||
| -rw-r--r-- | src/nvim/option_defs.h | 1 | ||||
| -rw-r--r-- | src/nvim/options.lua | 7 | ||||
| -rw-r--r-- | src/nvim/os/pty_process_win.c | 3 |
4 files changed, 1 insertions, 20 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 959b4c41a5..0c87a422dc 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -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; diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h index b66c4a7f02..fcad6836bf 100644 --- a/src/nvim/option_defs.h +++ b/src/nvim/option_defs.h @@ -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' diff --git a/src/nvim/options.lua b/src/nvim/options.lua index 2e20b692e8..a5a14a1a25 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -2497,13 +2497,6 @@ return { 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'}, vi_def=true, diff --git a/src/nvim/os/pty_process_win.c b/src/nvim/os/pty_process_win.c index 93f1656029..6f7100e846 100644 --- a/src/nvim/os/pty_process_win.c +++ b/src/nvim/os/pty_process_win.c @@ -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) { |