From: Kenichi Handa <handa@m17n.org>
Date: Fri, 2 Apr 1999 16:35:33 +0000 (+0000)
Subject: (redisplay_window): When we call compute_motion with
X-Git-Tag: emacs-20.4~392
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=919c7723dee863addb97819f67d283d6bed84c6f;p=emacs.git

(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 --git a/src/xdisp.c b/src/xdisp.c
index 2bc181bbab0..da6ec5e280b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2089,7 +2089,7 @@ redisplay_window (window, just_this_one, preserve_echo_area)
 	  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 @@ display_text_line (w, start, start_byte, vpos, hpos, taboffset, ovstr_done)
 		      ovstr += ovstr_done;
 		      ovlen -= ovstr_done;
 
-		      while (ovlen > 0)
+		      while (ovlen > 0 && p1 < endp)
 			{
 			  int charset, cols;
 			  GLYPH g;