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

diff --git a/src/xdisp.c b/src/xdisp.c
index b83d8250df9e5410100232241fd16d13c5087e97..7b1c5cd96fb8b08fcd2ee68226b9dcf4884a69c3 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -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'.  */