aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/term/xterm.el1
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6e78f41e6a7..609dcb117b4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-06-16 Chong Yidong <cyd@gnu.org>
2
3 * term/xterm.el (terminal-init-xterm): Discard input before
4 querying background mode (Bug#10959).
5
12012-06-16 Stefan Merten <smerten@oekonux.de> 62012-06-16 Stefan Merten <smerten@oekonux.de>
2 7
3 * textmodes/rst.el: Added and corrected some comments. 8 * textmodes/rst.el: Added and corrected some comments.
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 51e5aa5796d..28fb9da0b9d 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -539,6 +539,7 @@ The relevant features are:
539 (and (memq 'reportBackground tocheck-capabilities) 539 (and (memq 'reportBackground tocheck-capabilities)
540 version 540 version
541 (>= version 242))) 541 (>= version 242)))
542 (discard-input)
542 (send-string-to-terminal "\e]11;?\e\\") 543 (send-string-to-terminal "\e]11;?\e\\")
543 (when (and (equal (read-event nil nil 2) ?\e) 544 (when (and (equal (read-event nil nil 2) ?\e)
544 (equal (read-event nil nil 2) ?\])) 545 (equal (read-event nil nil 2) ?\]))