diff options
| author | Juanma Barranquero | 2014-04-25 18:11:07 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2014-04-25 18:11:07 +0200 |
| commit | dff4a9f6a4e9e42de6177e29faa7e3524b47e6d4 (patch) | |
| tree | 60924b65da522416f928b436f8525f5bc8bfc3d7 /lisp/term | |
| parent | 8de17fac97652d77bffd24e41b0097c863bd752b (diff) | |
| parent | 844465d6cac7c243e37e446067b1a2e06be293da (diff) | |
| download | emacs-dff4a9f6a4e9e42de6177e29faa7e3524b47e6d4.tar.gz emacs-dff4a9f6a4e9e42de6177e29faa7e3524b47e6d4.zip | |
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.el | 6 |
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: | |||
| 530 | ;; Since xterm-280, the terminal type (NUMBER1) is now 41 instead of 0. | 530 | ;; Since xterm-280, the terminal type (NUMBER1) is now 41 instead of 0. |
| 531 | (when (string-match "\\([0-9]+\\);\\([0-9]+\\);0" str) | 531 | (when (string-match "\\([0-9]+\\);\\([0-9]+\\);0" str) |
| 532 | (let ((version (string-to-number (match-string 2 str)))) | 532 | (let ((version (string-to-number (match-string 2 str)))) |
| 533 | (when (and (> version 2000) (equal (match-string 1 str) "1")) | ||
| 534 | ;; Hack attack! bug#16988: gnome-terminal reports "1;NNNN;0" | ||
| 535 | ;; with a large NNNN but is based on a rather old xterm code. | ||
| 536 | ;; Gnome terminal 3.6.1 reports 1;3406;0 | ||
| 537 | ;; Gnome terminal 2.32.1 reports 1;2802;0 | ||
| 538 | (setq version 200)) | ||
| 533 | ;; If version is 242 or higher, assume the xterm supports | 539 | ;; If version is 242 or higher, assume the xterm supports |
| 534 | ;; reporting the background color (TODO: maybe earlier | 540 | ;; reporting the background color (TODO: maybe earlier |
| 535 | ;; versions do too...) | 541 | ;; versions do too...) |