Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-258
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-259
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-260
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-261
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-155

2 files changed, 12 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c3314cb98e5..386c3d99a47 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-29  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (null_glyph_slice): New var.
+        (append_glyph, append_composite_glyph, append_stretch_glyph):
+        Use it to initialize glyph slice.
+
 2004-04-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * xdisp.c (x_produce_glyphs): Fix the proverbial int/Lisp_Object mixup.
diff --git a/src/xdisp.c b/src/xdisp.c
index e77fa98cab1..4a79521f65d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -795,6 +795,9 @@ int help_echo_pos;
 
 Lisp_Object previous_help_echo_string;
 
+/* Null glyph slice */
+
+static struct glyph_slice null_glyph_slice = { 0, 0, 0, 0 };
 
 
 /* Function prototypes.  */
@@ -18091,6 +18094,7 @@ append_glyph (it)
       glyph->glyph_not_available_p = it->glyph_not_available_p;
       glyph->face_id = it->face_id;
       glyph->u.ch = it->char_to_display;
+      glyph->slice = null_glyph_slice;
       glyph->font_type = FONT_TYPE_UNKNOWN;
       ++it->glyph_row->used[area];
     }
@@ -18127,6 +18131,7 @@ append_composite_glyph (it)
       glyph->glyph_not_available_p = 0;
       glyph->face_id = it->face_id;
       glyph->u.cmp_id = it->cmp_id;
+      glyph->slice = null_glyph_slice;
       glyph->font_type = FONT_TYPE_UNKNOWN;
       ++it->glyph_row->used[area];
     }
@@ -18338,6 +18343,7 @@ append_stretch_glyph (it, object, width, height, ascent)
       glyph->face_id = it->face_id;
       glyph->u.stretch.ascent = ascent;
       glyph->u.stretch.height = height;
+      glyph->slice = null_glyph_slice;
       glyph->font_type = FONT_TYPE_UNKNOWN;
       ++it->glyph_row->used[area];
     }