procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(Fnew_fontset): Fix handling of the case that an

Browse source 
element of FONTLIST is a cons of family and registry.
This commit is contained in:
Kenichi Handa 2001-02-24 02:45:00 +00:00
parent 66c56ed161
commit 41d79f4d2b
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/fontset.c
View file

@ -899,10 +899,14 @@ FONTLIST is an alist of charsets vs corresponding font name patterns.")
tem = XCAR (tail);
if (!CONSP (tem)
|| (charset = get_charset_id (XCAR (tem))) < 0
|| !STRINGP (XCDR (tem)))
error ("Elements of fontlist must be a cons of charset and font name");
|| (!STRINGP (XCDR (tem)) && !CONSP (XCDR (tem))))
error ("Elements of fontlist must be a cons of charset and font name pattern");
tem = Fdowncase (XCDR (tem));
tem = XCDR (tem);
if (STRINGP (tem))
tem = Fdowncase (tem);
else
tem = Fcons (Fdowncase (Fcar (tem)), Fdowncase (Fcdr (tem)));
if (charset == CHARSET_ASCII)
ascii_font = tem;
else
@ -920,7 +924,10 @@ FONTLIST is an alist of charsets vs corresponding font name patterns.")
for (; CONSP (elements); elements = XCDR (elements))
{
elt = XCAR (elements);
tem = Fcons (XCAR (elt), font_family_registry (XCDR (elt), 0));
tem = XCDR (elt);
if (STRINGP (tem))
tem = font_family_registry (tem, 0);
tem = Fcons (XCAR (elt), tem);
FONTSET_SET (fontset, XINT (XCAR (elt)), tem);
}