From 48728c92adb111ec8dde17ab0c045a4eece6ec32 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Tue, 14 May 2002 08:52:40 +0000 Subject: [PATCH] (fs_load_font): Check fontp->full_name (not fontname) against Vfont_encoding_alist. --- src/ChangeLog | 3 +++ src/fontset.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 03bf26c1c93..6172430e19a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2002-05-14 Kenichi Handa + * fontset.c (fs_load_font): Check fontp->full_name (not fontname) + against Vfont_encoding_alist. + * coding.c (Fdecode_sjis_char): Fix typo (0x7F->0xFF). Fix the handling of charset list. (encode_coding_iso_2022): Setup coding->safe_charsets in advance. diff --git a/src/fontset.c b/src/fontset.c index 2caa087c33b..89581231813 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -549,6 +549,7 @@ fs_load_font (f, fontname) if (!fontp) return NULL; + fontname = fontp->full_name; /* Fill in members (charset, vertical_centering, encoding, etc) of font_info structure that are not set by (*load_font_func). */ for (tail = Vfont_encoding_alist; CONSP (tail); tail = XCDR (tail)) @@ -567,7 +568,7 @@ fs_load_font (f, fontname) fontp->vertical_centering = (STRINGP (Vvertical_centering_font_regexp) && (fast_c_string_match_ignore_case - (Vvertical_centering_font_regexp, fontp->full_name) >= 0)); + (Vvertical_centering_font_regexp, fontname) >= 0)); fontp->font_encoder = NULL; -- 2.39.2