diff options
| -rw-r--r-- | runtime/doc/options.txt | 4 | ||||
| -rw-r--r-- | src/nvim/option.c | 2 | ||||
| -rw-r--r-- | src/nvim/os_unix.c | 26 | ||||
| -rw-r--r-- | src/nvim/term.c | 9 |
4 files changed, 2 insertions, 39 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 3fdb3f38b5..d38fb84f10 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -7490,9 +7490,7 @@ A jump table for the options with a short description can be found at |Q_op|. xterm entries...). *'ttyfast'* *'tf'* *'nottyfast'* *'notf'* -'ttyfast' 'tf' boolean (default off, on when 'term' is xterm, hpterm, - sun-cmd, screen, rxvt or dtterm; also - on when running Vim in a DOS console) +'ttyfast' 'tf' boolean (default on) global {not in Vi} Indicates a fast terminal connection. More characters will be sent to diff --git a/src/nvim/option.c b/src/nvim/option.c index 6dc3234dea..6428ef1eb3 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -1597,7 +1597,7 @@ static struct vimoption {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"ttyfast", "tf", P_BOOL|P_NO_MKRC|P_VI_DEF, (char_u *)&p_tf, PV_NONE, - {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"ttymouse", "ttym", P_STRING|P_NODEFAULT|P_NO_MKRC|P_VI_DEF, #if defined(FEAT_MOUSE) && defined(UNIX) (char_u *)&p_ttym, PV_NONE, diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c index d4b661bff8..af17676ebf 100644 --- a/src/nvim/os_unix.c +++ b/src/nvim/os_unix.c @@ -298,32 +298,6 @@ int use_xterm_mouse(void) return 0; } -int vim_is_vt300(char_u *name) -{ - if (name == NULL) - return FALSE; /* actually all ANSI comp. terminals should be here */ - /* catch VT100 - VT5xx */ - return (STRNICMP(name, "vt", 2) == 0 - && vim_strchr((char_u *)"12345", name[2]) != NULL) - || STRCMP(name, "builtin_vt320") == 0; -} - -/* - * Return TRUE if "name" is a terminal for which 'ttyfast' should be set. - * This should include all windowed terminal emulators. - */ -int vim_is_fastterm(char_u *name) -{ - if (name == NULL) - return FALSE; - if (vim_is_xterm(name) || vim_is_vt300(name)) - return TRUE; - return STRNICMP(name, "hpterm", 6) == 0 - || STRNICMP(name, "sun-cmd", 7) == 0 - || STRNICMP(name, "screen", 6) == 0 - || STRNICMP(name, "dtterm", 6) == 0; -} - #if defined(USE_FNAME_CASE) || defined(PROTO) /* * Set the case of the file name, if it already exists. This will cause the diff --git a/src/nvim/term.c b/src/nvim/term.c index f5c2d3c174..36e433d624 100644 --- a/src/nvim/term.c +++ b/src/nvim/term.c @@ -1418,15 +1418,6 @@ int set_termname(char_u *term) set_mouse_termcode(KS_MOUSE, (char_u *)"\233M"); # endif - -#if defined(UNIX) - /* - * 'ttyfast' is default on for xterm and a few others. - */ - if (vim_is_fastterm(term)) - p_tf = TRUE; -#endif - ttest(TRUE); /* make sure we have a valid set of terminal codes */ full_screen = TRUE; /* we can use termcap codes from now on */ |