* mh-e.texi (VERSION, EDITION, UPDATED, UPDATE-MONTH): Update for

[gnu-emacs] / lisp / term / xterm.el

diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 51e5aa5796d04ef8bc194d774aa34d13fa17e076..c03d64a2f5451fb76f46e42912b74eac999ac67c 100644 (file)
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -1,6 +1,6 @@
 ;;; xterm.el --- define function key sequences and standard colors for xterm
 
-;; Copyright (C) 1995, 2001-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2001-2013 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals
@@ -36,7 +36,7 @@ If `check', try to check if it does.
 If a list, assume that the listed features are supported, without checking.
 
 The relevant features are:
-  modifyOtherKeys  -- if supported, more key bindings work (e.g, \"\\C-,\")
+  modifyOtherKeys  -- if supported, more key bindings work (e.g., \"\\C-,\")
   reportBackground -- if supported, Xterm reports its background color
 "
   :version "24.1"
@@ -480,7 +480,7 @@ The relevant features are:
 
       ;; Use inheritance to let the main keymap override those defaults.
       ;; This way we don't override terminfo-derived settings or settings
-      ;; made in the .emacs file.
+      ;; made in the init file.
       (set-keymap-parent map (keymap-parent input-decode-map))
       (set-keymap-parent input-decode-map map)))
 
@@ -539,6 +539,7 @@ The relevant features are:
                 (and (memq 'reportBackground tocheck-capabilities)
                      version
                      (>= version 242)))
+       (discard-input)
         (send-string-to-terminal "\e]11;?\e\\")
         (when (and (equal (read-event nil nil 2) ?\e)
                    (equal (read-event nil nil 2) ?\]))