Mercurial > emacs
changeset 53096:0393f4b21967
(init_iterator): Initialize it->start to position
before reseating (in case start position is invisible).
(init_to_row_start): Set it->start to row-start.
(redisplay_window): Accept optional_new_start if start position
is invisible (in which case IT_CHARPOS overshoots PT).
(display_line): Setup row->start from it->start (rather than
it->current which is wrong if first char on line is invisible).
When done, reseat it->start to it->current (= start of next row).
(expose_area): Fix exposure of text area when first char (e.g. TAB)
is only partially visible.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Tue, 18 Nov 2003 23:44:11 +0000 |
parents | bebcff17499f |
children | bb31cf348e05 |
files | src/xdisp.c |
diffstat | 1 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Tue Nov 18 23:42:40 2003 +0000 +++ b/src/xdisp.c Tue Nov 18 23:44:11 2003 +0000 @@ -2180,6 +2180,8 @@ else IT_BYTEPOS (*it) = bytepos; + it->start = it->current; + /* Compute faces etc. */ reseat (it, it->current.pos, 1); } @@ -2443,6 +2445,7 @@ struct glyph_row *row; { init_from_display_pos (it, w, &row->start); + it->start = row->start; it->continuation_lines_width = row->continuation_lines_width; CHECK_IT (it); } @@ -11580,6 +11583,11 @@ MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); if (IT_CHARPOS (it) == PT) w->force_start = Qt; + /* IT may overshoot PT if text at PT is invisible. */ + else if (IT_CHARPOS (it) > PT && CHARPOS (startp) <= PT) + w->force_start = Qt; + + } /* Handle case where place to start displaying has been specified, @@ -14330,7 +14338,7 @@ prepare_desired_row (row); row->y = it->current_y; - row->start = it->current; + row->start = it->start; row->continuation_lines_width = it->continuation_lines_width; row->displays_text_p = 1; row->starts_in_middle_of_char_p = it->starts_in_middle_of_char_p; @@ -14721,6 +14729,7 @@ it->current_y += row->height; ++it->vpos; ++it->glyph_row; + it->start = it->current; return row->displays_text_p; } @@ -20284,9 +20293,9 @@ AREA. The first glyph of the text area can be partially visible. The first glyphs of other areas cannot. */ start_x = window_box_left_offset (w, area); + x = start_x; if (area == TEXT_AREA) - start_x += row->x; - x = start_x; + x += row->x; /* Find the first glyph that must be redrawn. */ while (first < end