emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r116485: * lisp/term/xterm.el (xterm--version-handle


From: Stefan Monnier
Subject: [Emacs-diffs] trunk r116485: * lisp/term/xterm.el (xterm--version-handler): Adapt to xterm-280's output.
Date: Thu, 20 Feb 2014 04:45:24 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 116485
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16657
author: W. Trevor King <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2014-02-19 23:45:19 -0500
message:
  * lisp/term/xterm.el (xterm--version-handler): Adapt to xterm-280's output.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/term/xterm.el             xterm.el-20091113204419-o5vbwnq5f7feedwu-884
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-19 21:04:06 +0000
+++ b/lisp/ChangeLog    2014-02-20 04:45:19 +0000
@@ -1,3 +1,8 @@
+2014-02-20  W. Trevor King  <address@hidden>  (tiny change)
+
+       * term/xterm.el (xterm--version-handler): Adapt to xterm-280's output
+       (bug#16657).
+
 2014-02-19  Juanma Barranquero  <address@hidden>
 
        * frameset.el (frameset-restore): Delay removing an old frame's

=== modified file 'lisp/term/xterm.el'
--- a/lisp/term/xterm.el        2014-01-01 07:43:34 +0000
+++ b/lisp/term/xterm.el        2014-02-20 04:45:19 +0000
@@ -500,8 +500,9 @@
     ;; 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...)


reply via email to

[Prev in Thread] Current Thread [Next in Thread]