From f08696c668bb1514996bb3245ca357baad63fe64 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Sat, 1 Dec 2007 02:41:05 +0000 Subject: [PATCH] (handle_composition_prop): Adjusted for the change of lispy gstring. Call a function for auto-composition with the third arg it->window. (fill_composite_glyph_string): Adjusted for the change of lispy string. (x_produce_glyphs): Adjusted for the change of font_prepare_compositionl. --- src/xdisp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/xdisp.c b/src/xdisp.c index 96244877a2e..0470cbd2ff3 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -4631,7 +4631,7 @@ handle_auto_composed_prop (it) it->c = FETCH_CHAR (pos_byte); } - args[3] = font_at (it->c, this_pos, face, it->w, it->string); + args[3] = it->window; } else #endif /* USE_FONT_BACKEND */ @@ -4734,7 +4734,7 @@ handle_composition_prop (it) ->key_and_value, cmp->hash_index * 2); - it->c = XINT (LGLYPH_CHAR (LGSTRING_GLYPH (lgstring, 0))); + it->c = LGLYPH_CHAR (LGSTRING_GLYPH (lgstring, 0)); } else #endif /* USE_FONT_BACKEND */ @@ -19305,9 +19305,9 @@ fill_composite_glyph_string (s, base_face, overlaps) Lisp_Object g = LGSTRING_GLYPH (gstring, i); unsigned code; XChar2b * store_pos; - if (NILP (LGLYPH_FROM (g))) + if (NILP (g)) break; - code = XUINT (LGLYPH_CODE (g)); + code = LGLYPH_CODE (g); store_pos = s->char2b + i; STORE_XCHAR2B (store_pos, code >> 8, code & 0xFF); } @@ -21109,7 +21109,7 @@ x_produce_glyphs (it) if (cmp->method == COMPOSITION_WITH_GLYPH_STRING) { if (! cmp->font || cmp->font != font) - font_prepare_composition (cmp); + font_prepare_composition (cmp, it->f); } else #endif /* USE_FONT_BACKEND */ -- 2.39.5