Mercurial > emacs

changeset 24557:7bc142e9e59f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author Kenichi Handa <handa@m17n.org>
date Fri, 02 Apr 1999 16:35:33 +0000
parents cfdf441b1331
children ea8a9509b52f
files src/xdisp.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;