[Emacs-diffs] emacs-24 r117009: * lisp/term/xterm.el (xterm--version-handler): Don't use modern xterm

[Stefan Monnier]

------------------------------------------------------------
revno: 117009
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16988
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-04-22 16:35:33 -0400
message:
  * lisp/term/xterm.el (xterm--version-handler): Don't use modern xterm
  features on gnome-terminal.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/term/xterm.el             xterm.el-20091113204419-o5vbwnq5f7feedwu-884

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-04-22 18:17:17 +0000
+++ b/lisp/ChangeLog    2014-04-22 20:35:33 +0000
@@ -1,3 +1,8 @@
+2014-04-22  Stefan Monnier  <address@hidden>
+
+       * term/xterm.el (xterm--version-handler): Don't use modern xterm
+       features on gnome-terminal (bug#16988).
+
 2014-04-22  Michael Heerdegen  <address@hidden>
 
        * dired.el (dired-insert-set-properties): Do not consider

=== modified file 'lisp/term/xterm.el'
--- a/lisp/term/xterm.el        2014-02-20 04:45:19 +0000
+++ b/lisp/term/xterm.el        2014-04-22 20:35:33 +0000
@@ -503,6 +503,12 @@
     ;; 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))))
+        (when (and (> version 2000) (equal (match-string 1 str) "1"))
+          ;; Hack attack!  bug#16988: gnome-terminal reports "1;NNNN;0"
+          ;; with a large NNNN but is based on a rather old xterm code.
+          ;; Gnome terminal 3.6.1 reports 1;3406;0
+          ;; Gnome terminal 2.32.1 reports 1;2802;0
+          (setq version 200))
         ;; If version is 242 or higher, assume the xterm supports
         ;; reporting the background color (TODO: maybe earlier
         ;; versions do too...)