* term/xterm.el (terminal-init-xterm): `version' may be nil. (Bug#8838)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a72f2a89d99051e076ab810d85d0c56e26cef607..23d6b097504b680bc15c421fdde87fa2d12d173f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-12  Glenn Morris  <rgm@gnu.org>
+
+       * term/xterm.el (terminal-init-xterm): `version' may be nil.  (Bug#8838)
+
 2011-06-12  Martin Rudalics  <rudalics@gmx.at>
 
        * window.el (window-safely-shrinkable-p): Restore function which

diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index c2b870bd5354da077e4d206f71f6ccbedc6b015c..e345b4dda8f2d4253aa42ee41050e5a5e9b75d81 100644 (file)
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -539,6 +539,7 @@ features.  Set to nil to skip the checks."
         ;; versions do too...)
         (when (or (memq 'reportBackground given-capabilities)
                   (and (memq 'reportBackground tocheck-capabilities)
+                       version
                        (>= version 242)))
           (send-string-to-terminal "\e]11;?\e\\")
           (when (equal (read-event nil nil 2) ?\e)
@@ -559,6 +560,7 @@ features.  Set to nil to skip the checks."
         ;; support.
         (when (or (memq 'modifyOtherKeys given-capabilities)
                   (and (memq 'modifyOtherKeys tocheck-capabilities)
+                       version
                        (>= version 216)))
           (terminal-init-xterm-modify-other-keys))