From: Kenichi Handa <handa@m17n.org>
Date: Mon, 19 Aug 2002 10:57:04 +0000 (+0000)
Subject: (Fset_fontset_font): Treate `ascii' as charset, not script.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1864^2~430
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=862aa7f95b49761fa57ee0fe8ff85a76eb0264a4;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index e5456942d44..b83271963a3 100644
--- 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 d1433a27599..b6246439999 100644
--- 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))