Mercurial > emacs

changeset 89572:971778c2578c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(load_font_get_repertory): Pay attention to the case that ENCODING of a font is specified by a char-table.
author Kenichi Handa <handa@m17n.org>
date Mon, 06 Oct 2003 11:22:42 +0000
parents 242f2cc0134b
children 6b5d42f51038
files src/fontset.c
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/fontset.c	Mon Oct 06 11:21:31 2003 +0000
+++ b/src/fontset.c	Mon Oct 06 11:22:42 2003 +0000
@@ -460,9 +460,14 @@
 {
   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))