]> granicus.if.org Git - vim/commitdiff
patch 8.1.0157: old iTerm2 is not recognized, resulting in stray output v8.1.0157
authorBram Moolenaar <Bram@vim.org>
Fri, 6 Jul 2018 21:11:40 +0000 (23:11 +0200)
committerBram Moolenaar <Bram@vim.org>
Fri, 6 Jul 2018 21:11:40 +0000 (23:11 +0200)
Problem:    Old iTerm2 is not recognized, resulting in stray output.
Solution:   Recognize the termresponse.

src/term.c
src/version.c

index 4545c78b578b5cfdd65bf9556352ab64c9787e46..21f9a3cfa70ce2ad401b21ddf74d1b1bfdaad3e2 100644 (file)
@@ -4659,17 +4659,21 @@ check_termcode(
 
                        if (version == 95)
                        {
-                           /* Mac Terminal.app sends 1;95;0 */
+                           // Mac Terminal.app sends 1;95;0
                            if (STRNCMP(tp + extra - 2, "1;95;0c", 7) == 0)
                            {
                                is_not_xterm = TRUE;
                                is_mac_terminal = TRUE;
                            }
 # ifdef FEAT_MOUSE_SGR
-                           /* iTerm2 sends 0;95;0 */
+                           // iTerm2 sends 0;95;0
                            if (STRNCMP(tp + extra - 2, "0;95;0c", 7) == 0)
                                is_iterm2 = TRUE;
+                           else
 # endif
+                           // old iTerm2 sends 0;95;
+                           if (STRNCMP(tp + extra - 2, "0;95;c", 6) == 0)
+                               is_not_xterm = TRUE;
                        }
 
                        /* Only set 'ttymouse' automatically if it was not set
index 63a7694d5f7e198230e26f2ced37cf3f4bf160b8..8d9a339f9694a6881c52cc2bc962fbd344c8777b 100644 (file)
@@ -789,6 +789,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    157,
 /**/
     156,
 /**/