mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-06 18:06:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change option name from termwintype to termtype

Browse Source
This commit is contained in:
erw7
2019-11-16 13:55:27 +09:00
committed by Björn Linse
parent 8f91d709b0
commit a5a3d7160d
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/option.c
View File

@@ -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:1", "yes:2", "yes:3", "yes:4", "yes:5", "yes:6", "yes:7", "yes:8",
"yes:9", NULL }; "yes:9", NULL };
#ifdef WIN32 #ifdef WIN32
static char *(p_twt_values[]) = { "conpty", "winpty", "", NULL }; static char *(p_tmt_values[]) = { "conpty", "winpty", "", NULL };
#endif #endif
/// All possible flags for 'shm'. /// All possible flags for 'shm'.
@@ -3289,8 +3289,8 @@ ambw_end:
errmsg = e_invarg; errmsg = e_invarg;
} }
#ifdef WIN32 #ifdef WIN32
} else if (varp == &p_twt) { } else if (varp == &p_tmt) {
if (check_opt_strings(*varp, p_twt_values, false) != OK if (check_opt_strings(*varp, p_tmt_values, false) != OK
|| (!os_has_conpty_working() && STRCMP(*varp, "conpty") == 0)) { || (!os_has_conpty_working() && STRCMP(*varp, "conpty") == 0)) {
errmsg = e_invarg; errmsg = e_invarg;
} }

2
src/nvim/option_defs.h
View File

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

4
src/nvim/options.lua
View File

@@ -2497,10 +2497,10 @@ return {
defaults={if_true={vi=false}} defaults={if_true={vi=false}}
}, },
{ {
full_name='termwintype', abbreviation='twt', full_name='termtype', abbreviation='tmt',
type='string', scope={'global'}, type='string', scope={'global'},
vi_def=false, vi_def=false,
varname='p_twt', varname='p_tmt',
defaults={if_true={vi="",vim=""}} defaults={if_true={vi="",vim=""}}
}, },
{ {

4
src/nvim/os/pty_process_win.c
View File

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