Mercurial > emacs
comparison src/fontset.c @ 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 | 29e773288013 |
children | f9a65d7ebd29 |
comparison
equal
deleted
inserted
replaced
90120:714b8cb2eadd | 90121:4465a2011c2d |
---|---|
778 not yet set. */ | 778 not yet set. */ |
779 void | 779 void |
780 set_default_ascii_font (fontname) | 780 set_default_ascii_font (fontname) |
781 Lisp_Object fontname; | 781 Lisp_Object fontname; |
782 { | 782 { |
783 if (! CONSP (FONTSET_ASCII (Vdefault_fontset))) | 783 if (! STRINGP (FONTSET_ASCII (Vdefault_fontset))) |
784 { | 784 { |
785 int id = fs_query_fontset (fontname, 2); | 785 int id = fs_query_fontset (fontname, 2); |
786 | 786 |
787 if (id >= 0) | 787 if (id >= 0) |
788 fontname = XCDR (FONTSET_ASCII (FONTSET_FROM_ID (id))); | 788 fontname = FONTSET_ASCII (FONTSET_FROM_ID (id)); |
789 FONTSET_ASCII (Vdefault_fontset) | 789 FONTSET_ASCII (Vdefault_fontset)= fontname; |
790 = Fcons (make_number (0), fontname); | |
791 } | 790 } |
792 } | 791 } |
793 | 792 |
794 | 793 |
795 /********** INTERFACES TO xfaces.c, xfns.c, and dispextern.h **********/ | 794 /********** INTERFACES TO xfaces.c, xfns.c, and dispextern.h **********/ |