patch 9.0.0948: 'ttyfast' is set for arbitrary terminalsv9.0.0948

Problem:    'ttyfast' is set for arbitrary terminals.
Solution:   Always set 'ttyfast'. (closes #11549)

5 files changed, 3 insertions, 35 deletions

diff --git a/src/optiondefs.h b/src/optiondefs.h
index 0278b6061a..e7eb357d7e 100644
--- a/src/optiondefs.h
+++ b/src/optiondefs.h
@@ -2599,7 +2599,7 @@ static struct vimoption options[] =
 			    {(char_u *)TRUE, (char_u *)0L} SCTX_INIT},
     {"ttyfast",	    "tf",   P_BOOL|P_NO_MKRC|P_VI_DEF,
 			    (char_u *)&p_tf, PV_NONE,
-			    {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
+			    {(char_u *)TRUE, (char_u *)0L} SCTX_INIT},
     {"ttymouse",    "ttym", P_STRING|P_NODEFAULT|P_NO_MKRC|P_VI_DEF,
 #if defined(UNIX) || defined(VMS)
 			    (char_u *)&p_ttym, PV_NONE,
diff --git a/src/os_unix.c b/src/os_unix.c
index 0540fc9504..fd6d35fedc 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -2438,24 +2438,6 @@ vim_is_vt300(char_u *name)
 }
 
 /*
- * 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) || vim_is_iris(name))
-	return TRUE;
-    return (   STRNICMP(name, "hpterm", 6) == 0
-	    || STRNICMP(name, "sun-cmd", 7) == 0
-	    || STRNICMP(name, "screen", 6) == 0
-	    || STRNICMP(name, "tmux", 4) == 0
-	    || STRNICMP(name, "dtterm", 6) == 0);
-}
-
-/*
  * Insert user name in s[len].
  * Return OK if a name found.
  */
diff --git a/src/proto/os_unix.pro b/src/proto/os_unix.pro
index f30b78d26c..9266364403 100644
--- a/src/proto/os_unix.pro
+++ b/src/proto/os_unix.pro
@@ -23,7 +23,6 @@ int use_xterm_like_mouse(char_u *name);
 int use_xterm_mouse(void);
 int vim_is_iris(char_u *name);
 int vim_is_vt300(char_u *name);
-int vim_is_fastterm(char_u *name);
 int mch_get_user_name(char_u *s, int len);
 int mch_get_uname(uid_t uid, char_u *s, int len);
 void mch_get_host_name(char_u *s, int len);
diff --git a/src/term.c b/src/term.c
index 8a428338a8..ec3c3db5ad 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2174,21 +2174,6 @@ set_termname(char_u *term)
     }
 #endif
 
-#if defined(UNIX) || defined(VMS)
-    /*
-     * 'ttyfast' is default on for xterm, iris-ansi and a few others.
-     */
-    if (vim_is_fastterm(term))
-	p_tf = TRUE;
-#endif
-#ifdef USE_TERM_CONSOLE
-    /*
-     * 'ttyfast' is default on consoles
-     */
-    if (term_console)
-	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
diff --git a/src/version.c b/src/version.c
index 5686005f34..8427210fdb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    948,
+/**/
     947,
 /**/
     946,