# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 923070933 0
# Node ID 7bc142e9e59f15e2930549343e207c19f9c64157
# Parent  cfdf441b13315ee3c3df09d35da1095ae10f300d
(redisplay_window): When we call compute_motion with
HPOS got from w->last_point_x, call it with DID_MOTION 1.
(display_text_line): Stop the loop for processing overlay strings
when we reach the right edge of the window.

diff -r cfdf441b1331 -r 7bc142e9e59f src/xdisp.c
--- a/src/xdisp.c	Thu Apr 01 13:59:57 1999 +0000
+++ b/src/xdisp.c	Fri Apr 02 16:35:33 1999 +0000
@@ -2089,7 +2089,7 @@
 	  int tab_offset = (pos_tab_offset (w, last_point, last_point_byte)
 			    - (last_point_x + hscroll - !! hscroll));
 
-	  pos = *compute_motion (last_point, last_point_y, last_point_x, 0,
+	  pos = *compute_motion (last_point, last_point_y, last_point_x, 1,
 				 PT, height,
 				 /* BUG FIX: See the comment of	
 				    Fpos_visible_in_window_p (window.c).  */
@@ -3457,7 +3457,7 @@
 		      ovstr += ovstr_done;
 		      ovlen -= ovstr_done;
 
-		      while (ovlen > 0)
+		      while (ovlen > 0 && p1 < endp)
 			{
 			  int charset, cols;
 			  GLYPH g;