aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2005-03-14 05:39:20 +0000
committerKenichi Handa2005-03-14 05:39:20 +0000
commitd7fb7b9121faed24d57fcd6b28056d8dc71953d7 (patch)
tree21bc56cd717f9873f00ab6e0b5d1b2c828f5d74c /src
parent4673248c7f01aca3016a0830124fd5e76d96a38b (diff)
downloademacs-d7fb7b9121faed24d57fcd6b28056d8dc71953d7.tar.gz
emacs-d7fb7b9121faed24d57fcd6b28056d8dc71953d7.zip
(set_default_ascii_font): Fix the change for syncing with CVS head.
Diffstat (limited to 'src')
-rw-r--r--src/fontset.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/fontset.c b/src/fontset.c
index 4c54d636398..2d3df6c6e52 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -780,14 +780,13 @@ void
780set_default_ascii_font (fontname) 780set_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