Mercurial > emacs

comparison src/dispnew.c @ 12627:c7bc7a24b1ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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 aa3b050f8a32
children a3466dad7d6d
comparison
equal deleted inserted replaced
12626:f9a5365b158a 12627:c7bc7a24b1ff
1326 1326
1327 /* Now just clean up termcap drivers and set cursor, etc. */ 1327 /* Now just clean up termcap drivers and set cursor, etc. */
1328 if (!pause) 1328 if (!pause)
1329 { 1329 {
1330 if ((cursor_in_echo_area 1330 if ((cursor_in_echo_area
1331 && FRAME_HAS_MINIBUF_P (f) 1331 /* If we are showing a message instead of the minibuffer,
1332 && EQ (FRAME_MINIBUF_WINDOW (f), minibuf_window)) 1332 show the cursor for the message instead of for the
1333 /* If we are showing a message instead of the minibuffer, 1333 (now hidden) minibuffer contents. */
1334 show the cursor for the message instead of for the 1334 || (EQ (minibuf_window, selected_window)
1335 (now hidden) minibuffer contents. */ 1335 && EQ (minibuf_window, echo_area_window)
1336 || (EQ (minibuf_window, selected_window) 1336 && echo_area_glyphs != 0))
1337 && echo_area_glyphs != 0)) 1337 /* These cases apply only to the frame that contains
1338 the active minibuffer window. */
1339 && FRAME_HAS_MINIBUF_P (f)
1340 && EQ (FRAME_MINIBUF_WINDOW (f), minibuf_window))
1338 { 1341 {
1339 int top = XINT (XWINDOW (FRAME_MINIBUF_WINDOW (f))->top); 1342 int top = XINT (XWINDOW (FRAME_MINIBUF_WINDOW (f))->top);
1340 int row, col; 1343 int row, col;
1341 1344
1342 if (cursor_in_echo_area < 0) 1345 if (cursor_in_echo_area < 0)