aboutsummaryrefslogtreecommitdiffstats
path: root/src/fontset.c
diff options
context:
space:
mode:
authorKenichi Handa2002-08-19 10:57:04 +0000
committerKenichi Handa2002-08-19 10:57:04 +0000
commit862aa7f95b49761fa57ee0fe8ff85a76eb0264a4 (patch)
tree6bd088d5860eebcae30cbe67531d84cd3c16b9e5 /src/fontset.c
parent154f5e74e32f7f149e1c6c35e832b442944a6274 (diff)
downloademacs-862aa7f95b49761fa57ee0fe8ff85a76eb0264a4.tar.gz
emacs-862aa7f95b49761fa57ee0fe8ff85a76eb0264a4.zip
(Fset_fontset_font): Treate `ascii' as charset, not script.
Diffstat (limited to 'src/fontset.c')
-rw-r--r--src/fontset.c14
1 files changed, 7 insertions, 7 deletions
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. */)
1265 map_char_table (accumulate_script_ranges, Qnil, Vchar_script_table, 1265 map_char_table (accumulate_script_ranges, Qnil, Vchar_script_table,
1266 val, 0, NULL); 1266 val, 0, NULL);
1267 range_list = XCDR (val); 1267 range_list = XCDR (val);
1268 if (EQ (character, Qascii))
1269 {
1270 if (! STRINGP (font_spec))
1271 font_spec = generate_ascii_font_name (FONTSET_NAME (fontset),
1272 font_spec);
1273 FONTSET_ASCII (fontset) = font_spec;
1274 }
1275 } 1268 }
1276 else if (CHARSETP (character)) 1269 else if (CHARSETP (character))
1277 { 1270 {
@@ -1283,6 +1276,13 @@ appended. By default, FONT-SPEC overrides the previous settings. */)
1283 = Fcons (Fcons (make_number (CHARSET_MIN_CHAR (charset)), 1276 = Fcons (Fcons (make_number (CHARSET_MIN_CHAR (charset)),
1284 make_number (CHARSET_MAX_CHAR (charset))), 1277 make_number (CHARSET_MAX_CHAR (charset))),
1285 range_list); 1278 range_list);
1279 if (EQ (character, Qascii))
1280 {
1281 if (! STRINGP (font_spec))
1282 font_spec = generate_ascii_font_name (FONTSET_NAME (fontset),
1283 font_spec);
1284 FONTSET_ASCII (fontset) = font_spec;
1285 }
1286 } 1286 }
1287 1287
1288 if (NILP (range_list)) 1288 if (NILP (range_list))