Mercurial > emacs
changeset 11649:d3a8fb1db72f
(display_text_line): Don't move the cursor if it's supposed to
be in the echo area.
(echo_area_display): Put cursor in echo area if appropriate.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Tue, 02 May 1995 02:17:21 +0000 |
| parents | e09e51d7c35a |
| children | 38f3ac2845f7 |
| files | src/xdisp.c |
| diffstat | 1 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Tue May 02 01:57:30 1995 +0000 +++ b/src/xdisp.c Tue May 02 02:17:21 1995 +0000 @@ -567,6 +567,8 @@ 0, 0, 0, 0, FRAME_WIDTH (f)); /* If desired cursor location is on this line, put it at end of text */ + if (cursor_in_echo_area) + FRAME_CURSOR_Y (f) = vpos; if (FRAME_CURSOR_Y (f) == vpos) FRAME_CURSOR_X (f) = FRAME_DESIRED_GLYPHS (f)->used[vpos]; @@ -2803,8 +2805,12 @@ cursor_hpos += XFASTINT (w->left); if (w == XWINDOW (FRAME_SELECTED_WINDOW (f))) { - FRAME_CURSOR_Y (f) = cursor_vpos; - FRAME_CURSOR_X (f) = cursor_hpos; + if (!(cursor_in_echo_area && FRAME_HAS_MINIBUF_P (f) + && EQ (FRAME_MINIBUF_WINDOW (f), minibuf_window))) + { + FRAME_CURSOR_Y (f) = cursor_vpos; + FRAME_CURSOR_X (f) = cursor_hpos; + } if (w == XWINDOW (selected_window)) {