aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/term
diff options
context:
space:
mode:
authorGlenn Morris2011-06-12 12:56:41 -0700
committerGlenn Morris2011-06-12 12:56:41 -0700
commit9db51acaf1991e638e07fc6a624265d4d64b74ae (patch)
tree57eb9187257bd085ed839c1bf868edb6b445e3bb /lisp/term
parentea3596a2f31dff4d614451a13bcafcad60e39365 (diff)
downloademacs-9db51acaf1991e638e07fc6a624265d4d64b74ae.tar.gz
emacs-9db51acaf1991e638e07fc6a624265d4d64b74ae.zip
* term/xterm.el (terminal-init-xterm): `version' may be nil. (Bug#8838)
Diffstat (limited to 'lisp/term')
-rw-r--r--lisp/term/xterm.el2
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index c2b870bd535..e345b4dda8f 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -539,6 +539,7 @@ features. Set to nil to skip the checks."
539 ;; versions do too...) 539 ;; versions do too...)
540 (when (or (memq 'reportBackground given-capabilities) 540 (when (or (memq 'reportBackground given-capabilities)
541 (and (memq 'reportBackground tocheck-capabilities) 541 (and (memq 'reportBackground tocheck-capabilities)
542 version
542 (>= version 242))) 543 (>= version 242)))
543 (send-string-to-terminal "\e]11;?\e\\") 544 (send-string-to-terminal "\e]11;?\e\\")
544 (when (equal (read-event nil nil 2) ?\e) 545 (when (equal (read-event nil nil 2) ?\e)
@@ -559,6 +560,7 @@ features. Set to nil to skip the checks."
559 ;; support. 560 ;; support.
560 (when (or (memq 'modifyOtherKeys given-capabilities) 561 (when (or (memq 'modifyOtherKeys given-capabilities)
561 (and (memq 'modifyOtherKeys tocheck-capabilities) 562 (and (memq 'modifyOtherKeys tocheck-capabilities)
563 version
562 (>= version 216))) 564 (>= version 216)))
563 (terminal-init-xterm-modify-other-keys)) 565 (terminal-init-xterm-modify-other-keys))
564 566