(store_next_glyph): Renamed from append_glyph.

(generate_stretch_glyph): Renamed from produce_stretch_glyph.
All callers changed accordingly.

diff --git a/src/ChangeLog b/src/ChangeLog
index d699b23f05927a1c1e55d1ec27cbec8924d5e4bc..867306579ab466935e2ecd383ff7c4d10b5ee0e7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-21  Ken Raeburn  <raeburn@raeburn.org>
+
+       * xdisp.c (store_next_glyph): Renamed from append_glyph.
+       (generate_stretch_glyph): Renamed from produce_stretch_glyph.
+       All callers changed accordingly.
+
 2006-03-21  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * xterm.c: x_session_initialized new variable.

diff --git a/src/xdisp.c b/src/xdisp.c
index 7b1c5cd96fb8b08fcd2ee68226b9dcf4884a69c3..b83d8250df9e5410100232241fd16d13c5087e97 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
-append_glyph (it)
+store_next_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
-produce_stretch_glyph (it)
+generate_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
-               append_glyph (it);
+               store_next_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)
-           append_glyph (it);
+           store_next_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)
-    produce_stretch_glyph (it);
+    generate_stretch_glyph (it);
 
   /* Accumulate dimensions.  Note: can't assume that it->descent > 0
      because this isn't true for images with `:ascent 100'.  */