summaryrefslogtreecommitdiff
path: root/lisp/term/xterm.el
diff options
context:
space:
mode:
authorW. Trevor King <wking@tremily.us>2014-02-19 23:45:19 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2014-02-19 23:45:19 -0500
commiteee0d650346cc3182f08a88940f0e06325721c70 (patch)
tree2ef86bfb03b51a3eda8415d75fbe0e7f023b6251 /lisp/term/xterm.el
parent94e5e202d952ac74c6540ed41b1bac957855c5fa (diff)
downloademacs-eee0d650346cc3182f08a88940f0e06325721c70.tar.gz
* lisp/term/xterm.el (xterm--version-handler): Adapt to xterm-280's output.
Fixes: debbugs:16657
Diffstat (limited to 'lisp/term/xterm.el')
-rw-r--r--lisp/term/xterm.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 87f8c966deb..eac40141979 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -500,8 +500,9 @@ The relevant features are:
;; see if by using a longer timeout we get rid of most issues.
(while (and (setq chr (read-event nil nil 2)) (not (equal chr ?c)))
(setq str (concat str (string chr))))
- (when (string-match "0;\\([0-9]+\\);0" str)
- (let ((version (string-to-number (match-string 1 str))))
+ ;; 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))))
;; If version is 242 or higher, assume the xterm supports
;; reporting the background color (TODO: maybe earlier
;; versions do too...)