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

against Vfont_encoding_alist.

diff --git a/src/ChangeLog b/src/ChangeLog
index 03bf26c1c936b1e1ceb0a79d8245cd781a23bb42..6172430e19a134a1b88aae3797d2685a5f5dbdd3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 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.

diff --git a/src/fontset.c b/src/fontset.c
index 2caa087c33b69a51d01c6c25f681bf1de05791c2..895812318137e6f673c320c8fa089e7a2f6fbcdc 100644 (file)
--- 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;