[Emacs-diffs] Changes to emacs/src/xdisp.c

[Ken Raeburn]

Index: emacs/src/xdisp.c
diff -u emacs/src/xdisp.c:1.1081 emacs/src/xdisp.c:1.1082
--- emacs/src/xdisp.c:1.1081    Sun Mar 19 19:38:48 2006
+++ emacs/src/xdisp.c   Wed Mar 22 05:05:35 2006
@@ -19383,7 +19383,7 @@
    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 @@
    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 @@
                                        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 @@
          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 @@
   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'.  */