summaryrefslogtreecommitdiff
path: root/lisp/term
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2014-04-25 18:11:07 +0200
committerJuanma Barranquero <lekktu@gmail.com>2014-04-25 18:11:07 +0200
commitdff4a9f6a4e9e42de6177e29faa7e3524b47e6d4 (patch)
tree60924b65da522416f928b436f8525f5bc8bfc3d7 /lisp/term
parent8de17fac97652d77bffd24e41b0097c863bd752b (diff)
parent844465d6cac7c243e37e446067b1a2e06be293da (diff)
downloademacs-dff4a9f6a4e9e42de6177e29faa7e3524b47e6d4.tar.gz
Merge from emacs-24; up to 2014-04-25T10:35:01Z!michael.albinus@gmx.de
Diffstat (limited to 'lisp/term')
-rw-r--r--lisp/term/xterm.el6
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 33eb61dac1e..f8ff0cc91dc 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -530,6 +530,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...)