(Fset_fontset_font): Treate `ascii' as charset, not script.

diff --git a/src/ChangeLog b/src/ChangeLog
index e5456942d442a8d5a060bd28dfc4a33c136eb0ff..b83271963a33377eedb5bdc27258dc6b7f9ed941 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2002-08-19  Kenichi Handa  <handa@etl.go.jp>
 
+       * fontset.c (Fset_fontset_font): Treate `ascii' as charset, not
+       script.
+
        * emacs.c (main): In the case of --unibyte, instead of aborting on
        finding non-empty buffer, make it unibyte.
 

diff --git a/src/fontset.c b/src/fontset.c
index d1433a2759919d23306249d7bb85bb05ef69eaa3..b6246439999f9c3cab489e38bb026ad9f1154082 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1265,13 +1265,6 @@ appended.  By default, FONT-SPEC overrides the previous settings.  */)
          map_char_table (accumulate_script_ranges, Qnil, Vchar_script_table,
                          val, 0, NULL);
          range_list = XCDR (val); 
-         if (EQ (character, Qascii))
-           {
-             if (! STRINGP (font_spec))
-               font_spec = generate_ascii_font_name (FONTSET_NAME (fontset),
-                                                     font_spec);
-             FONTSET_ASCII (fontset) = font_spec;
-           }
        }
       else if (CHARSETP (character))
        {
@@ -1283,6 +1276,13 @@ appended.  By default, FONT-SPEC overrides the previous settings.  */)
              = Fcons (Fcons (make_number (CHARSET_MIN_CHAR (charset)),
                              make_number (CHARSET_MAX_CHAR (charset))),
                       range_list);
+         if (EQ (character, Qascii))
+           {
+             if (! STRINGP (font_spec))
+               font_spec = generate_ascii_font_name (FONTSET_NAME (fontset),
+                                                     font_spec);
+             FONTSET_ASCII (fontset) = font_spec;
+           }
        }
 
       if (NILP (range_list))