diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/term/xterm.el | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 94a194bbd99..833c089f107 100644 --- 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 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...) |