Don't clear echo area prematurely when handling select window events (Bug#11304).

* keyboard.c (read_char): Don't wipe echo area for select window
events: These might get delayed via `mouse-autoselect-window'
(Bug#11304).
* window.el (handle-select-window): Clear echo area since this is
no more done by read_char (Bug#11304).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 848fc4349564df2a19b01b15a515db78fcff655e..1b5c9d75e9edc7f9f1984f061e58c2a125b4e8cb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-24  Martin Rudalics  <rudalics@gmx.at>
+
+       * window.el (handle-select-window): Clear echo area since this is
+       no more done by read_char (Bug#11304).
+
 2012-04-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * ibuffer.el (ibuffer-mode-map): Bind `/ m' to filter-used-mode

diff --git a/lisp/window.el b/lisp/window.el
index c148f5ee01fc34fe2621f9fdf1fc1909d14aedd1..b8f1bf3456d3492ceacdcd05dd5dc981d9da2cec 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5727,6 +5727,8 @@ is active.  This function is run by `mouse-autoselect-window-timer'."
        (setq mouse-autoselect-window-state nil)
        ;; Run `mouse-leave-buffer-hook' when autoselecting window.
        (run-hooks 'mouse-leave-buffer-hook))
+      ;; Clear echo area.
+      (message nil)
       (select-window window))))
 
 (defun truncated-partial-width-window-p (&optional window)

diff --git a/src/ChangeLog b/src/ChangeLog
index 30ba6d6c4a9c1b433b5e005ec0d21c569e872e9a..3fccf8cc439c3973198372ab4bf137385150ff8f 100644 (file)
--- 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 614746e35b21abcde64224831d5dda68053145b1..48b31d8b564b6f13d1fd964d7721dd4016ab6e71 100644 (file)
--- 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);