summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-07-06 23:11:40 +0200
committerBram Moolenaar <Bram@vim.org>2018-07-06 23:11:40 +0200
commite330ef42f256e60017e5f8bf4be79a5308fe9e2f (patch)
tree1dbcc76e4c851441c15956be56f3b20d8314aeb9
parent5d2f40792e47a48fc56efafd30b68660a42184a7 (diff)
downloadvim-git-8.1.0157.tar.gz
patch 8.1.0157: old iTerm2 is not recognized, resulting in stray outputv8.1.0157
Problem: Old iTerm2 is not recognized, resulting in stray output. Solution: Recognize the termresponse.
-rw-r--r--src/term.c8
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 2 deletions
diff --git a/src/term.c b/src/term.c
index 4545c78b5..21f9a3cfa 100644
--- a/src/term.c
+++ b/src/term.c
@@ -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
diff --git a/src/version.c b/src/version.c
index 63a7694d5..8d9a339f9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -790,6 +790,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 157,
+/**/
156,
/**/
155,