bug#17607: emacs -nw FILE incurs 2-second wait before displaying anything

[Stefan Monnier <monnier@iro.umontreal.ca>]

[ Please don't crosspost messages between emacs-devel and bug-gnu-emacs.
  Or between bug-gnu-emacs and pretty much anything else.  ]

>>> This problem arises only with OS X's "Terminal" (2.3 (309)), but not
>>> with aterm, xterm, or iTerm.  Here's the output of "C-h l":
>>> ESC [ > 8 3 ; 4 0 0 0 3 ; 0 c C-h l
>> Hmmm... can you check with the Emacs pretest (24.3.91 or checked out
>> from `emacs-24')?  If you still see the problem there, please make it
>> a bug report so we can better track it.
> I confirm that the 2-second delay still strikes when using a
> just-bootstrapped-from-"emacs-24" binary and running
> src/emacs -nw -Q FILE.  I see the same output as above for "C-h l".

Does the patch below fix the 2-second wait?


        Stefan


=== modified file 'lisp/term/xterm.el'
--- lisp/term/xterm.el	2014-04-22 20:35:33 +0000
+++ lisp/term/xterm.el	2014-06-12 13:30:56 +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 (and (> version 2000) (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.
+          (setq version 240))
         ;; If version is 242 or higher, assume the xterm supports
         ;; reporting the background color (TODO: maybe earlier
         ;; versions do too...)