From: Kim F. Storm <storm@cua.dk>
Date: Wed, 22 Mar 2006 22:47:22 +0000 (+0000)
Subject: * xdisp.c: Undo 2006-03-21 change.
X-Git-Tag: emacs-pretest-22.0.90~3462
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5bd3b1b2da76eaccb84eb55caa2c2856025f9b3a;p=emacs.git

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

diff --git a/src/xdisp.c b/src/xdisp.c
index b83d8250df9..7b1c5cd96fb 100644
--- 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'.  */