[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108018: Don't clear echo area prematurely when handling select window events (Bug#11304).

[martin rudalics]

------------------------------------------------------------
revno: 108018
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Tue 2012-04-24 10:56:31 +0200
message:
  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).
modified:
  lisp/ChangeLog
  lisp/window.el
  src/ChangeLog
  src/keyboard.c

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-24 03:40:57 +0000
+++ b/lisp/ChangeLog    2012-04-24 08:56:31 +0000
@@ -1,3 +1,8 @@
+2012-04-24  Martin Rudalics  <address@hidden>
+
+       * window.el (handle-select-window): Clear echo area since this is
+       no more done by read_char (Bug#11304).
+
 2012-04-24  Stefan Monnier  <address@hidden>
 
        * ibuffer.el (ibuffer-mode-map): Bind `/ m' to filter-used-mode

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2012-04-20 08:48:50 +0000
+++ b/lisp/window.el    2012-04-24 08:56:31 +0000
@@ -5727,6 +5727,8 @@
        (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)

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-04-24 08:35:02 +0000
+++ b/src/ChangeLog     2012-04-24 08:56:31 +0000
@@ -1,3 +1,9 @@
+2012-04-24  Martin Rudalics  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnutls.c (init_gnutls_functions): Protect against (unlikely)

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2012-04-23 05:44:49 +0000
+++ b/src/keyboard.c    2012-04-24 08:56:31 +0000
@@ -2984,7 +2984,10 @@
      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);