* lisp/term/xterm.el (xterm--version-handler): Adapt to xterm-280's output.

Fixes: debbugs:16657

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 94a194bbd99c437e08f6fc4a2a54026aa62cec04..833c089f10722a4e858f4a0bd40f43b333d1cfae 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-20  W. Trevor King  <wking@tremily.us>  (tiny change)
+
+       * term/xterm.el (xterm--version-handler): Adapt to xterm-280's output
+       (bug#16657).
+
 2014-02-19  Juanma Barranquero  <lekktu@gmail.com>
 
        * frameset.el (frameset-restore): Delay removing an old frame's

diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 87f8c966deb7939a040817d1b172bda29a154e87..eac401419799606980763fa272cefb4bc9ebfe99 100644 (file)
--- 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...)