From b5bbc9a59cdabb823b32f0ddd564c7745192abc7 Mon Sep 17 00:00:00 2001 From: Karl Heuer Date: Tue, 2 May 1995 02:17:21 +0000 Subject: [PATCH] (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. --- src/xdisp.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/xdisp.c b/src/xdisp.c index 1fa29343966..0d25c7f5155 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -567,6 +567,8 @@ echo_area_display () 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 @@ display_text_line (w, start, vpos, hpos, taboffset) 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)) { -- 2.39.5