From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 10 May 1998 00:40:00 +0000 (+0000)
Subject: (redisplay_window): Don't use last_point_x and last_point_y
X-Git-Tag: emacs-20.3~1066
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/e6b506397310455f7aee813dd29f196bd702e411?ds=sidebyside

(redisplay_window): Don't use last_point_x and last_point_y
if cursor_in_echo_area.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 6df80a4056..8b2eabb5e2 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2037,13 +2037,17 @@ redisplay_window (window, just_this_one, preserve_echo_area)
       /* Find where PT is located now on the frame.  */
       /* Check just_this_one as a way of verifying that the 
 	 window edges have not changed.  */
-      if (PT == XFASTINT (w->last_point) && just_this_one)
+      if (PT == XFASTINT (w->last_point) && just_this_one
+	  /* If CURSOR_IN_ECHO_AREA, last_point_x and last_point_y
+	     refer to the echo area and are not related to this window.  */
+	  && ! cursor_in_echo_area)
 	{
 	  pos.hpos = last_point_x;
 	  pos.vpos = last_point_y;
 	  pos.bufpos = PT;
 	}
       else if (PT > XFASTINT (w->last_point)
+	       && ! cursor_in_echo_area
 	       && XFASTINT (w->last_point) > startp && just_this_one
 	       /* We can't use this if point is in the left margin of a
 		  hscrolled window, because w->last_point_x has been