summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-09-11 20:34:13 +0200
committerBram Moolenaar <Bram@vim.org>2017-09-11 20:34:13 +0200
commitc212798333cab2239acd387725987f27c6d8a3f7 (patch)
treef8c48b528e5c166f87e3143f24d6db95b6a52afd
parentb4d5fbabc99917a8069ba32a60c2d73d4f60e128 (diff)
downloadvim-git-c212798333cab2239acd387725987f27c6d8a3f7.tar.gz
patch 8.0.1094: using ssh from Terminal.app runs into xterm incompatibilityv8.0.1094
Problem: Using ssh from Terminal.app runs into xterm incompatibility. Solution: Also detect Terminal.app on non-Mac systems.
-rw-r--r--src/term.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/term.c b/src/term.c
index bc8c6ace2..22c7c9a1f 100644
--- a/src/term.c
+++ b/src/term.c
@@ -4566,12 +4566,12 @@ check_termcode(
/* Detect terminals that set $TERM to something like
* "xterm-256colors" but are not fully xterm
* compatible. */
-# ifdef MACOS
+
/* Mac Terminal.app sends 1;95;0 */
if (version == 95
&& STRNCMP(tp + extra - 2, "1;95;0c", 7) == 0)
is_not_xterm = TRUE;
-# endif
+
/* Gnome terminal sends 1;3801;0, 1;4402;0 or 1;2501;0.
* xfce4-terminal sends 1;2802;0.
* screen sends 83;40500;0
diff --git a/src/version.c b/src/version.c
index 88849e995..013038816 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1094,
+/**/
1093,
/**/
1092,