diff options
| author | Richard M. Stallman <rms@gnu.org> | 1995-07-21 07:46:14 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1995-07-21 07:46:14 +0000 |
| commit | 2577053b1dc99c0be16f43a0d432e876760c1e57 (patch) | |
| tree | 42e769a98271e6728e23e4bca33f521fb5ed43e4 /src | |
| parent | acedc3e30b2e4377d1050914bb41b7ba58fe99df (diff) | |
| download | emacs-2577053b1dc99c0be16f43a0d432e876760c1e57.tar.gz | |
(update_frame): Check that the echo area is in the frame being displayed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dispnew.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index bc79d41463b..455d1585dd4 100644 --- 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; |