aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKim F. Storm2004-04-28 21:00:40 +0000
committerKim F. Storm2004-04-28 21:00:40 +0000
commit2883e85a242c8167da1e52304008880b23872bde (patch)
tree9ce67c12b7863e4995446ef294941814f5178acb /src
parent712d23dc22bbf24b287fce2ba4daf5cbb6d33379 (diff)
downloademacs-2883e85a242c8167da1e52304008880b23872bde.tar.gz
emacs-2883e85a242c8167da1e52304008880b23872bde.zip
(null_glyph_slice): New var.
(append_glyph, append_composite_glyph, append_stretch_glyph): Use it to initialize glyph slice.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 54efa19c5cc..08a5db4df39 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -799,6 +799,9 @@ int help_echo_pos;
799 799
800Lisp_Object previous_help_echo_string; 800Lisp_Object previous_help_echo_string;
801 801
802/* Null glyph slice */
803
804static struct glyph_slice null_glyph_slice = { 0, 0, 0, 0 };
802 805
803 806
804/* Function prototypes. */ 807/* Function prototypes. */
@@ -18092,6 +18095,7 @@ append_glyph (it)
18092 glyph->glyph_not_available_p = it->glyph_not_available_p; 18095 glyph->glyph_not_available_p = it->glyph_not_available_p;
18093 glyph->face_id = it->face_id; 18096 glyph->face_id = it->face_id;
18094 glyph->u.ch = it->char_to_display; 18097 glyph->u.ch = it->char_to_display;
18098 glyph->slice = null_glyph_slice;
18095 glyph->font_type = FONT_TYPE_UNKNOWN; 18099 glyph->font_type = FONT_TYPE_UNKNOWN;
18096 ++it->glyph_row->used[area]; 18100 ++it->glyph_row->used[area];
18097 } 18101 }
@@ -18128,6 +18132,7 @@ append_composite_glyph (it)
18128 glyph->glyph_not_available_p = 0; 18132 glyph->glyph_not_available_p = 0;
18129 glyph->face_id = it->face_id; 18133 glyph->face_id = it->face_id;
18130 glyph->u.cmp_id = it->cmp_id; 18134 glyph->u.cmp_id = it->cmp_id;
18135 glyph->slice = null_glyph_slice;
18131 glyph->font_type = FONT_TYPE_UNKNOWN; 18136 glyph->font_type = FONT_TYPE_UNKNOWN;
18132 ++it->glyph_row->used[area]; 18137 ++it->glyph_row->used[area];
18133 } 18138 }
@@ -18339,6 +18344,7 @@ append_stretch_glyph (it, object, width, height, ascent)
18339 glyph->face_id = it->face_id; 18344 glyph->face_id = it->face_id;
18340 glyph->u.stretch.ascent = ascent; 18345 glyph->u.stretch.ascent = ascent;
18341 glyph->u.stretch.height = height; 18346 glyph->u.stretch.height = height;
18347 glyph->slice = null_glyph_slice;
18342 glyph->font_type = FONT_TYPE_UNKNOWN; 18348 glyph->font_type = FONT_TYPE_UNKNOWN;
18343 ++it->glyph_row->used[area]; 18349 ++it->glyph_row->used[area];
18344 } 18350 }