diff options
| author | erw7 <erw7.github@gmail.com> | 2019-11-16 13:55:27 +0900 |
|---|---|---|
| committer | Björn Linse <bjorn.linse@gmail.com> | 2020-01-17 11:36:28 +0100 |
| commit | a5a3d7160d7cb70ef2477f243d7a537fc4fa20e8 (patch) | |
| tree | 2ef5f24c4b4b5722971576d2f1f087980f188af4 | |
| parent | 8f91d709b0006e3fcfa4cb59abd9b77938096d76 (diff) | |
| download | rneovim-a5a3d7160d7cb70ef2477f243d7a537fc4fa20e8.tar.gz rneovim-a5a3d7160d7cb70ef2477f243d7a537fc4fa20e8.tar.bz2 rneovim-a5a3d7160d7cb70ef2477f243d7a537fc4fa20e8.zip | |
Change option name from termwintype to termtype
| -rw-r--r-- | src/nvim/option.c | 6 | ||||
| -rw-r--r-- | src/nvim/option_defs.h | 2 | ||||
| -rw-r--r-- | src/nvim/options.lua | 4 | ||||
| -rw-r--r-- | src/nvim/os/pty_process_win.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 014eb676a0..959b4c41a5 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -314,7 +314,7 @@ static char *(p_scl_values[]) = { "yes", "no", "auto", "auto:1", "auto:2", "yes:1", "yes:2", "yes:3", "yes:4", "yes:5", "yes:6", "yes:7", "yes:8", "yes:9", NULL }; #ifdef WIN32 -static char *(p_twt_values[]) = { "conpty", "winpty", "", NULL }; +static char *(p_tmt_values[]) = { "conpty", "winpty", "", NULL }; #endif /// All possible flags for 'shm'. @@ -3289,8 +3289,8 @@ ambw_end: errmsg = e_invarg; } #ifdef WIN32 - } else if (varp == &p_twt) { - if (check_opt_strings(*varp, p_twt_values, false) != OK + } 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; } diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h index 1d4c31dc1c..b66c4a7f02 100644 --- a/src/nvim/option_defs.h +++ b/src/nvim/option_defs.h @@ -654,7 +654,7 @@ 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_twt; ///< 'termwintype' +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 fe970ccba3..2e20b692e8 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -2497,10 +2497,10 @@ return { defaults={if_true={vi=false}} }, { - full_name='termwintype', abbreviation='twt', + full_name='termtype', abbreviation='tmt', type='string', scope={'global'}, vi_def=false, - varname='p_twt', + varname='p_tmt', defaults={if_true={vi="",vim=""}} }, { diff --git a/src/nvim/os/pty_process_win.c b/src/nvim/os/pty_process_win.c index 64d4408ece..93f1656029 100644 --- a/src/nvim/os/pty_process_win.c +++ b/src/nvim/os/pty_process_win.c @@ -56,8 +56,8 @@ int pty_process_spawn(PtyProcess *ptyproc) assert(proc->err.closed); - int pty_type = *p_twt; - if (pty_type == 'c' && os_has_conpty_working()) { + int pty_type = *p_tmt; + if (pty_type != 'w' && os_has_conpty_working()) { if ((conpty_object = os_conpty_init(&in_name, &out_name, ptyproc->width, ptyproc->height)) != NULL) { |