From: Ken Raeburn <raeburn@raeburn.org>
Date: Wed, 22 Mar 2006 05:06:41 +0000 (+0000)
Subject: (store_next_glyph): Renamed from append_glyph.
X-Git-Tag: emacs-pretest-22.0.90~3468
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d63cd76657e12b92a5d7736a15bc9b97a7f9990e;p=emacs.git

(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 d699b23f059..867306579ab 100644
--- 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,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* xterm.c: x_session_initialized new variable.
diff --git a/src/xdisp.c b/src/xdisp.c
index 7b1c5cd96fb..b83d8250df9 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
-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'.  */