From f7a9f116b0f28e71717c155a9e4450fce4d9a1d1 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Mon, 6 Oct 2003 11:22:42 +0000 Subject: [PATCH] (load_font_get_repertory): Pay attention to the case that ENCODING of a font is specified by a char-table. --- src/fontset.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/fontset.c b/src/fontset.c index e9232f2a25e..82628c2585c 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -460,9 +460,14 @@ load_font_get_repertory (f, face, font_def, fontset) { char *font_name; struct font_info *font_info; + int charset; font_name = choose_face_font (f, face->lface, AREF (font_def, 0), NULL); - if (! (font_info = fs_load_font (f, font_name, XINT (AREF (font_def, 1))))) + if (NATNUMP (AREF (font_def, 1))) + charset = XINT (AREF (font_def, 1)); + else + charset = -1; + if (! (font_info = fs_load_font (f, font_name, charset))) return -1; if (NILP (AREF (font_def, 2)) -- 2.39.2