[Emacs-diffs] emacs-24 r117236: * lisp/term/xterm.el (xterm--version-handler): Work around for OSX

[Stefan Monnier]

------------------------------------------------------------
revno: 117236
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17607
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-06-13 11:06:29 -0400
message:
  * lisp/term/xterm.el (xterm--version-handler): Work around for OSX
  Terminal.app.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/term/xterm.el             xterm.el-20091113204419-o5vbwnq5f7feedwu-884

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-06-08 17:46:51 +0000
+++ b/lisp/ChangeLog    2014-06-13 15:06:29 +0000
@@ -1,3 +1,8 @@
+2014-06-13  Stefan Monnier  <address@hidden>
+
+       * term/xterm.el (xterm--version-handler): Work around for OSX
+       Terminal.app (bug#17607).
+
 2014-06-08  Glenn Morris  <address@hidden>
 
        * startup.el (initial-buffer-choice): Doc fix.

=== modified file 'lisp/term/xterm.el'
--- a/lisp/term/xterm.el        2014-04-22 20:35:33 +0000
+++ b/lisp/term/xterm.el        2014-06-13 15:06:29 +0000
@@ -509,6 +509,10 @@
           ;; Gnome terminal 3.6.1 reports 1;3406;0
           ;; Gnome terminal 2.32.1 reports 1;2802;0
           (setq version 200))
+        (when (equal (match-string 1 str) "83")
+          ;; OSX's Terminal.app (version 2.3 (309), which returns 83;40003;0)
+          ;; seems to also lack support for some of these (bug#17607).
+          (setq version 240))
         ;; If version is 242 or higher, assume the xterm supports
         ;; reporting the background color (TODO: maybe earlier
         ;; versions do too...)