changeset 90121:4465a2011c2d

(set_default_ascii_font): Fix the change for syncing with CVS head.
author Kenichi Handa <handa@m17n.org>
date Mon, 14 Mar 2005 05:39:20 +0000
parents 714b8cb2eadd
children 4448038ca381
files src/fontset.c
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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;
     }
 }