(update_frame): Check that the echo area is in the frame being displayed.

diff --git a/src/dispnew.c b/src/dispnew.c
index bc79d41463b6344b16f87cf3f7feb436cd2c1359..455d1585dd4b1145205e7e9b3d02ecf9b62f010c 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -1328,13 +1328,16 @@ update_frame (f, force, inhibit_hairy_id)
   if (!pause)
     {
       if ((cursor_in_echo_area
-          && FRAME_HAS_MINIBUF_P (f)
-          && EQ (FRAME_MINIBUF_WINDOW (f), minibuf_window))
-         /* If we are showing a message instead of the minibuffer,
-            show the cursor for the message instead of for the
-            (now hidden) minibuffer contents.  */
-         || (EQ (minibuf_window, selected_window)
-             && echo_area_glyphs != 0))
+          /* If we are showing a message instead of the minibuffer,
+             show the cursor for the message instead of for the
+             (now hidden) minibuffer contents.  */
+          || (EQ (minibuf_window, selected_window)
+              && EQ (minibuf_window, echo_area_window)
+              && echo_area_glyphs != 0))
+         /* These cases apply only to the frame that contains
+            the active minibuffer window.  */
+         && FRAME_HAS_MINIBUF_P (f)
+         && EQ (FRAME_MINIBUF_WINDOW (f), minibuf_window))
        {
          int top = XINT (XWINDOW (FRAME_MINIBUF_WINDOW (f))->top);
          int row, col;