diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-08-31 20:17:59 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-08-31 20:17:59 +0200 |
| commit | 2db0ec4b2ec405aca4e642e0420ce703f94914a8 (patch) | |
| tree | a120bf56ef1ca30dce4eaec1b9eca250978b010b | |
| parent | 5c6dbcb03fa552d7b0e61c8fcf425147eb6bf7d5 (diff) | |
| download | vim-git-2db0ec4b2ec405aca4e642e0420ce703f94914a8.tar.gz | |
patch 8.0.1027: more terminals can't handle requesting cursor modev8.0.1027
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.
| -rw-r--r-- | src/term.c | 17 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 16 insertions, 3 deletions
diff --git a/src/term.c b/src/term.c index 424489206..85292db85 100644 --- 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 b33b2d42b..56803bc04 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 */ /**/ + 1027, +/**/ 1026, /**/ 1025, |