Mercurial > emacs
changeset 70206:d099dc7dc981
Fix last change:
(produce_stretch_glyph): Assume that face box height and width is
already included in stretch glyph size so caller doesn't have to
consider the extra space otherwise added (fixes problem in ses.el).
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Mon, 24 Apr 2006 00:22:26 +0000 |
| parents | ea7d882a4a09 |
| children | e5703d5024e4 |
| files | src/xdisp.c |
| diffstat | 1 files changed, 6 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Mon Apr 24 00:21:55 2006 +0000 +++ b/src/xdisp.c Mon Apr 24 00:22:26 2006 +0000 @@ -19865,30 +19865,12 @@ && it->current_x + width > it->last_visible_x) width = it->last_visible_x - it->current_x - 1; - if (width > 0 && height > 0) - { - - if (face->box != FACE_NO_BOX && face->box_line_width != 0) - { - if (face->box_line_width > 0) - { - ascent += face->box_line_width; - height += face->box_line_width * 2; - } - - if (it->start_of_box_run_p) - width += abs (face->box_line_width); - if (it->end_of_box_run_p) - width += abs (face->box_line_width); - } - - if (it->glyph_row) - { - Lisp_Object object = it->stack[it->sp - 1].string; - if (!STRINGP (object)) - object = it->w->buffer; - append_stretch_glyph (it, object, width, height, ascent); - } + if (width > 0 && height > 0 && it->glyph_row) + { + Lisp_Object object = it->stack[it->sp - 1].string; + if (!STRINGP (object)) + object = it->w->buffer; + append_stretch_glyph (it, object, width, height, ascent); } it->pixel_width = width;