Mercurial > emacs

comparison src/fontset.c @ 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 2f877ed80fa6
children 7f9f2d025eee
comparison
equal deleted inserted replaced
89571:242f2cc0134b 89572:971778c2578c
458 Lisp_Object font_def; 458 Lisp_Object font_def;
459 Lisp_Object fontset; 459 Lisp_Object fontset;
460 { 460 {
461 char *font_name; 461 char *font_name;
462 struct font_info *font_info; 462 struct font_info *font_info;
463 int charset;
463 464
464 font_name = choose_face_font (f, face->lface, AREF (font_def, 0), NULL); 465 font_name = choose_face_font (f, face->lface, AREF (font_def, 0), NULL);
465 if (! (font_info = fs_load_font (f, font_name, XINT (AREF (font_def, 1))))) 466 if (NATNUMP (AREF (font_def, 1)))
467 charset = XINT (AREF (font_def, 1));
468 else
469 charset = -1;
470 if (! (font_info = fs_load_font (f, font_name, charset)))
466 return -1; 471 return -1;
467 472
468 if (NILP (AREF (font_def, 2)) 473 if (NILP (AREF (font_def, 2))
469 && NILP (Fassq (make_number (font_info->font_idx), 474 && NILP (Fassq (make_number (font_info->font_idx),
470 FONTSET_REPERTORY (fontset)))) 475 FONTSET_REPERTORY (fontset))))