Mercurial > emacs
comparison src/dispnew.c @ 35268:d93bf580d166
(update_text_area): Put code which decrements the
stop position when the row's face extends to the end of the
line in ? 0.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Fri, 12 Jan 2001 14:09:54 +0000 |
parents | 670f8ab148ea |
children | ec15c68b25ba |
comparison
equal
deleted
inserted
replaced
35267:5695de532559 | 35268:d93bf580d166 |
---|---|
4196 { | 4196 { |
4197 int stop, i, x; | 4197 int stop, i, x; |
4198 struct glyph *current_glyph = current_row->glyphs[TEXT_AREA]; | 4198 struct glyph *current_glyph = current_row->glyphs[TEXT_AREA]; |
4199 struct glyph *desired_glyph = desired_row->glyphs[TEXT_AREA]; | 4199 struct glyph *desired_glyph = desired_row->glyphs[TEXT_AREA]; |
4200 int overlapping_glyphs_p = current_row->contains_overlapping_glyphs_p; | 4200 int overlapping_glyphs_p = current_row->contains_overlapping_glyphs_p; |
4201 | 4201 int desired_stop_pos = desired_row->used[TEXT_AREA]; |
4202 | |
4203 #if 0 /* This shouldn't be necessary. Let's check it. */ | |
4202 /* If the desired row extends its face to the text area end, | 4204 /* If the desired row extends its face to the text area end, |
4203 make sure we write at least one glyph, so that the face | 4205 make sure we write at least one glyph, so that the face |
4204 extension actually takes place. */ | 4206 extension actually takes place. */ |
4205 int desired_stop_pos = (desired_row->used[TEXT_AREA] | 4207 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row) |
4206 - (MATRIX_ROW_EXTENDS_FACE_P (desired_row) | 4208 && !w->pseudo_window_p) |
4207 ? 1 : 0)); | 4209 --desired_stop_pos; |
4210 #endif | |
4208 | 4211 |
4209 stop = min (current_row->used[TEXT_AREA], desired_stop_pos); | 4212 stop = min (current_row->used[TEXT_AREA], desired_stop_pos); |
4210 i = 0; | 4213 i = 0; |
4211 x = desired_row->x; | 4214 x = desired_row->x; |
4212 | 4215 |
4314 } | 4317 } |
4315 | 4318 |
4316 /* Maybe clear to end of line. */ | 4319 /* Maybe clear to end of line. */ |
4317 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row)) | 4320 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row)) |
4318 { | 4321 { |
4322 #if 0 | |
4319 /* If new row extends to the end of the text area, nothing | 4323 /* If new row extends to the end of the text area, nothing |
4320 has to be cleared, if and only if we did a write_glyphs | 4324 has to be cleared, if and only if we did a write_glyphs |
4321 above. This is made sure by setting desired_stop_pos | 4325 above. This is made sure by setting desired_stop_pos |
4322 appropriately above. */ | 4326 appropriately above. */ |
4323 xassert (i < desired_row->used[TEXT_AREA]); | 4327 xassert (i < desired_row->used[TEXT_AREA]); |
4328 #endif | |
4324 } | 4329 } |
4325 else if (MATRIX_ROW_EXTENDS_FACE_P (current_row)) | 4330 else if (MATRIX_ROW_EXTENDS_FACE_P (current_row)) |
4326 { | 4331 { |
4327 /* If old row extends to the end of the text area, clear. */ | 4332 /* If old row extends to the end of the text area, clear. */ |
4328 if (i >= desired_row->used[TEXT_AREA]) | 4333 if (i >= desired_row->used[TEXT_AREA]) |