Mercurial > emacs
changeset 88857:477f764c048a
(fontset_ref, fontset_set, fs_load_font)
(Ffontset_info): Convert Lisp types.
| author | Dave Love <fx@gnu.org> |
|---|---|
| date | Tue, 16 Jul 2002 15:10:44 +0000 |
| parents | 13a375bc220d |
| children | 889b48cce7a1 |
| files | src/fontset.c |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/fontset.c Tue Jul 16 15:10:13 2002 +0000 +++ b/src/fontset.c Tue Jul 16 15:10:44 2002 +0000 @@ -231,7 +231,7 @@ for (tail = FONTSET_CHARSET_ALIST (fontset); CONSP (tail); tail = XCDR (tail)) { - charset = CHARSET_FROM_ID (XCAR (XCAR (tail))); + charset = CHARSET_FROM_ID (XINT (XCAR (XCAR (tail)))); if (ENCODE_CHAR (charset, c) != CHARSET_INVALID_CODE (charset)) { elt = XCDR (XCAR (tail)); @@ -260,8 +260,8 @@ { Lisp_Object id, slot, tail; - id = make_number (CHARSET_SYMBOL_ID (idx)); - if (id == charset_ascii) + id = CHARSET_SYMBOL_ID (idx); + if (XFASTINT (id) == charset_ascii) Fset_char_table_range (fontset, Fcons (make_number (0), make_number (127)), elt); @@ -559,7 +559,7 @@ if (STRINGP (XCAR (elt)) && CHARSETP (XCDR (elt)) && fast_c_string_match_ignore_case (XCAR (elt), fontname) >= 0) { - fontp->charset = CHARSET_SYMBOL_ID (XCDR (elt)); + fontp->charset = XFASTINT (CHARSET_SYMBOL_ID (XCDR (elt))); break; } } @@ -1173,7 +1173,7 @@ { elt = XCAR (tail); elt = Fcons ((INTEGERP (XCAR (elt)) - ? CHARSET_NAME (CHARSET_FROM_ID (XCAR (elt))) + ? CHARSET_NAME (CHARSET_FROM_ID (XFASTINT (XCAR (elt)))) : XCAR (elt)), Fcons (XCDR (elt), Qnil)); XSETCDR (XCAR (val), Fcons (elt, Qnil));