Commit 48728c92 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

(fs_load_font): Check fontp->full_name (not fontname)

against Vfont_encoding_alist.
parent 5afaefc1
2002-05-14 Kenichi Handa <handa@etl.go.jp>
 
* 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.
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment