2 files changed, 9 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca2781b40f2..1ecc6a140ab 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * term/xterm.el (xterm--version-handler): Work around for OSX
+        Terminal.app (bug#17607).
+
 2014-06-08  Glenn Morris  <rgm@gnu.org>
 
         * startup.el (initial-buffer-choice): Doc fix.
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 52487f3bded..5d4112b24fd 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -509,6 +509,10 @@ The relevant features are:
           ;; 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...)