Commit 5bd3b1b2 authored by Kim F. Storm's avatar Kim F. Storm
Browse files

* xdisp.c: Undo 2006-03-21 change.

parent ea049c5e
......@@ -19383,7 +19383,7 @@ draw_glyphs (w, x, row, area, start, end, hl, overlaps)
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 @@ append_stretch_glyph (it, object, width, height, ascent)
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 @@ x_produce_glyphs (it)
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 @@ x_produce_glyphs (it)
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 @@ x_produce_glyphs (it)
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'. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment