# HG changeset patch # User Kenichi Handa # Date 1110778760 0 # Node ID 4465a2011c2d39eb0956f792417aa4d61be5ff3f # Parent 714b8cb2eadd1cb4f6f82b71936a431a58550b04 (set_default_ascii_font): Fix the change for syncing with CVS head. diff -r 714b8cb2eadd -r 4465a2011c2d src/fontset.c --- a/src/fontset.c Mon Mar 14 05:38:59 2005 +0000 +++ b/src/fontset.c Mon Mar 14 05:39:20 2005 +0000 @@ -780,14 +780,13 @@ set_default_ascii_font (fontname) Lisp_Object fontname; { - if (! CONSP (FONTSET_ASCII (Vdefault_fontset))) + if (! STRINGP (FONTSET_ASCII (Vdefault_fontset))) { int id = fs_query_fontset (fontname, 2); if (id >= 0) - fontname = XCDR (FONTSET_ASCII (FONTSET_FROM_ID (id))); - FONTSET_ASCII (Vdefault_fontset) - = Fcons (make_number (0), fontname); + fontname = FONTSET_ASCII (FONTSET_FROM_ID (id)); + FONTSET_ASCII (Vdefault_fontset)= fontname; } }