From f7e0450a3707d408ac32e4694e4c87ec37d4d204 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 22 Apr 2014 16:35:33 -0400 Subject: [PATCH] * lisp/term/xterm.el (xterm--version-handler): Don't use modern xterm features on gnome-terminal. Fixes: debbugs:16988 --- lisp/ChangeLog | 5 +++++ lisp/term/xterm.el | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 679c9ab51d..b76d3c4a19 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-04-22 Stefan Monnier + + * term/xterm.el (xterm--version-handler): Don't use modern xterm + features on gnome-terminal (bug#16988). + 2014-04-22 Michael Heerdegen * dired.el (dired-insert-set-properties): Do not consider diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el index eac4014197..52487f3bde 100644 --- a/lisp/term/xterm.el +++ b/lisp/term/xterm.el @@ -503,6 +503,12 @@ The relevant features are: ;; Since xterm-280, the terminal type (NUMBER1) is now 41 instead of 0. (when (string-match "\\([0-9]+\\);\\([0-9]+\\);0" str) (let ((version (string-to-number (match-string 2 str)))) + (when (and (> version 2000) (equal (match-string 1 str) "1")) + ;; Hack attack! bug#16988: gnome-terminal reports "1;NNNN;0" + ;; with a large NNNN but is based on a rather old xterm code. + ;; Gnome terminal 3.6.1 reports 1;3406;0 + ;; Gnome terminal 2.32.1 reports 1;2802;0 + (setq version 200)) ;; If version is 242 or higher, assume the xterm supports ;; reporting the background color (TODO: maybe earlier ;; versions do too...) -- 2.20.1