changeset 55220:d6780b4bbfa5

(null_glyph_slice): New var. (append_glyph, append_composite_glyph, append_stretch_glyph): Use it to initialize glyph slice.
author Kim F. Storm <storm@cua.dk>
date Wed, 28 Apr 2004 21:00:40 +0000
parents 7f21f42b5c55
children c5dd3d0f1c5d
files src/xdisp.c
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/xdisp.c	Wed Apr 28 21:00:06 2004 +0000
+++ b/src/xdisp.c	Wed Apr 28 21:00:40 2004 +0000
@@ -799,6 +799,9 @@
 
 Lisp_Object previous_help_echo_string;
 
+/* Null glyph slice */
+
+static struct glyph_slice null_glyph_slice = { 0, 0, 0, 0 };
 
 
 /* Function prototypes.  */
@@ -18092,6 +18095,7 @@
       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];
     }
@@ -18128,6 +18132,7 @@
       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];
     }
@@ -18339,6 +18344,7 @@
       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];
     }