Mercurial > emacs
changeset 69636:51f98bc8ce67
* xdisp.c: Undo 2006-03-21 change.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Wed, 22 Mar 2006 22:47:22 +0000 |
| parents | 1c382971f1d0 |
| children | 8b3e0cacc358 |
| files | src/xdisp.c |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Wed Mar 22 22:46:57 2006 +0000 +++ b/src/xdisp.c Wed Mar 22 22:47:22 2006 +0000 @@ -19383,7 +19383,7 @@ Called from x_produce_glyphs when IT->glyph_row is non-null. */ static INLINE void -store_next_glyph (it) +append_glyph (it) struct it *it; { struct glyph *glyph; @@ -19707,7 +19707,7 @@ ASCENT must be in the range 0 <= ASCENT <= 100. */ static void -generate_stretch_glyph (it) +produce_stretch_glyph (it) struct it *it; { /* (space :width WIDTH :height HEIGHT ...) */ @@ -20133,7 +20133,7 @@ it->ascent + it->descent, ascent); } else - store_next_glyph (it); + append_glyph (it); /* If characters with lbearing or rbearing are displayed in this line, record that fact in a flag of the @@ -20315,7 +20315,7 @@ take_vertical_position_into_account (it); if (it->glyph_row) - store_next_glyph (it); + append_glyph (it); } it->multibyte_p = saved_multibyte_p; } @@ -20595,7 +20595,7 @@ else if (it->what == IT_IMAGE) produce_image_glyph (it); else if (it->what == IT_STRETCH) - generate_stretch_glyph (it); + produce_stretch_glyph (it); /* Accumulate dimensions. Note: can't assume that it->descent > 0 because this isn't true for images with `:ascent 100'. */