summaryrefslogtreecommitdiff
path: root/src/xdisp.c
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>1999-04-02 16:35:33 +0000
committerKenichi Handa <handa@m17n.org>1999-04-02 16:35:33 +0000
commit919c7723dee863addb97819f67d283d6bed84c6f (patch)
tree4d78746b5142905a92cbde159630811084612b17 /src/xdisp.c
parent6629e5ba9ee3fcea70b28f1e13691d3ac0b9be1e (diff)
downloademacs-919c7723dee863addb97819f67d283d6bed84c6f.tar.gz
(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.
Diffstat (limited to 'src/xdisp.c')
-rw-r--r--src/xdisp.c4
1 files changed, 2 insertions, 2 deletions
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;