Mercurial > emacs
changeset 12627:c7bc7a24b1ff
(update_frame): Check that the echo area is in the frame being displayed.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Fri, 21 Jul 1995 07:46:14 +0000 |
| parents | f9a5365b158a |
| children | 397f6d4852ff |
| files | src/dispnew.c |
| diffstat | 1 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dispnew.c Fri Jul 21 05:05:49 1995 +0000 +++ b/src/dispnew.c Fri Jul 21 07:46:14 1995 +0000 @@ -1328,13 +1328,16 @@ 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;