2 files changed, 10 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 30ba6d6c4a9..3fccf8cc439 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-24  Martin Rudalics  <rudalics@gmx.at>
+
+        * keyboard.c (read_char): Don't wipe echo area for select window
+        events: These might get delayed via `mouse-autoselect-window'
+        (Bug#11304).
+
 2012-04-24  Juanma Barranquero  <lekktu@gmail.com>
 
         * gnutls.c (init_gnutls_functions): Protect against (unlikely)
diff --git a/src/keyboard.c b/src/keyboard.c
index 614746e35b2..48b31d8b564 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2984,7 +2984,10 @@ read_char (int commandflag, ptrdiff_t nmaps, Lisp_Object *maps,
      own stuff with the echo area.  */
   if (!CONSP (c)
       || (!(EQ (Qhelp_echo, XCAR (c)))
-          && !(EQ (Qswitch_frame, XCAR (c)))))
+          && !(EQ (Qswitch_frame, XCAR (c)))
+          /* Don't wipe echo area for select window events: These might
+             get delayed via `mouse-autoselect-window' (Bug#11304).  */
+          && !(EQ (Qselect_window, XCAR (c)))))
     {
       if (!NILP (echo_area_buffer[0]))
         safe_run_hooks (Qecho_area_clear_hook);