patch 8.0.1027: more terminals can't handle requesting cursor mode

Problem:    More terminals can't handle requesting cursor mode.
Solution:   Recognize Putty. (Hirohito Higashi)  Also include Xfce in the
            version check. (Dominique Pelle)  Recognize Konsole.

diff --git a/src/term.c b/src/term.c
index 424489206f683418337e71db9509ce78c14f7753..85292db8572dfc4711a190280c8fe89cc571446a 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -4562,10 +4562,21 @@ check_termcode(
                                && STRNCMP(tp + extra - 2, "1;95;0c", 7) == 0)
                            is_not_xterm = TRUE;
 #  endif
-                       /* Gnome Terminal.app sends 1;3801;0 or 1;4402;0,
-                        * assuming any version number over 3000 is not an
+                       /* Gnome terminal sends 1;3801;0 or 1;4402;0.
+                        * xfce4-terminal sends 1;2802;0.
+                        * Assuming any version number over 2800 is not an
                         * xterm. */
-                       if (col >= 3000)
+                       if (col >= 2800)
+                           is_not_xterm = TRUE;
+
+                       /* PuTTY sends 0;136;0 */
+                       if (col == 136
+                               && STRNCMP(tp + extra - 2, "0;136;0c", 8) == 0)
+                           is_not_xterm = TRUE;
+
+                       /* Konsole sends 0;115;0 */
+                       if (col == 115
+                               && STRNCMP(tp + extra - 2, "0;115;0c", 8) == 0)
                            is_not_xterm = TRUE;
 
                        /* Only request the cursor style if t_SH and t_RS are

diff --git a/src/version.c b/src/version.c
index b33b2d42b43085efdcfc804f2d336ac1e03ca88b..56803bc047871239196c57780fae0214f70b4544 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1027,
 /**/
     1026,
 /**/