[Emacs-diffs] /srv/bzr/emacs/trunk r104575: * term/xterm.el (terminal-init-xterm): `version' may be nil. (Bug#8838)

[Glenn Morris]

------------------------------------------------------------
revno: 104575
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2011-06-12 12:56:41 -0700
message:
  * term/xterm.el (terminal-init-xterm): `version' may be nil.  (Bug#8838)
modified:
  lisp/ChangeLog
  lisp/term/xterm.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-06-12 07:46:56 +0000
+++ b/lisp/ChangeLog    2011-06-12 19:56:41 +0000
@@ -1,3 +1,7 @@
+2011-06-12  Glenn Morris  <address@hidden>
+
+       * term/xterm.el (terminal-init-xterm): `version' may be nil.  (Bug#8838)
+
 2011-06-12  Martin Rudalics  <address@hidden>
 
        * window.el (window-safely-shrinkable-p): Restore function which

=== modified file 'lisp/term/xterm.el'
--- a/lisp/term/xterm.el        2011-06-09 16:58:18 +0000
+++ b/lisp/term/xterm.el        2011-06-12 19:56:41 +0000
@@ -539,6 +539,7 @@
         ;; 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 @@
         ;; support.
         (when (or (memq 'modifyOtherKeys given-capabilities)
                   (and (memq 'modifyOtherKeys tocheck-capabilities)
+                       version
                        (>= version 216)))
           (terminal-init-xterm-modify-other-keys))