# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 799381041 0
# Node ID d3a8fb1db72f45eb61f11ebc7c2ede6ff17fb83c
# Parent  e09e51d7c35aa2046e88695500c30e3500d3a4f4
(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.

diff -r e09e51d7c35a -r d3a8fb1db72f src/xdisp.c
--- 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))
 	    {