Mercurial > emacs

comparison src/fontset.c @ 89006:faa38aebf129

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Fset_fontset_font): Treate `ascii' as charset, not script.
author Kenichi Handa <handa@m17n.org>
date Mon, 19 Aug 2002 10:56:54 +0000
parents d50b0a9ea97a
children c2201502f37e
comparison
equal deleted inserted replaced
89005:7c7b866077e9 89006:faa38aebf129
1263 { 1263 {
1264 val = Fcons (character, Qnil); 1264 val = Fcons (character, Qnil);
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 }
1269 else if (CHARSETP (character))
1270 {
1271 struct charset *charset;
1272
1273 CHECK_CHARSET_GET_CHARSET (character, charset);
1274 if (CHARSET_METHOD (charset) == CHARSET_METHOD_OFFSET)
1275 range_list
1276 = Fcons (Fcons (make_number (CHARSET_MIN_CHAR (charset)),
1277 make_number (CHARSET_MAX_CHAR (charset))),
1278 range_list);
1268 if (EQ (character, Qascii)) 1279 if (EQ (character, Qascii))
1269 { 1280 {
1270 if (! STRINGP (font_spec)) 1281 if (! STRINGP (font_spec))
1271 font_spec = generate_ascii_font_name (FONTSET_NAME (fontset), 1282 font_spec = generate_ascii_font_name (FONTSET_NAME (fontset),
1272 font_spec); 1283 font_spec);
1273 FONTSET_ASCII (fontset) = font_spec; 1284 FONTSET_ASCII (fontset) = font_spec;
1274 } 1285 }
1275 }
1276 else if (CHARSETP (character))
1277 {
1278 struct charset *charset;
1279
1280 CHECK_CHARSET_GET_CHARSET (character, charset);
1281 if (CHARSET_METHOD (charset) == CHARSET_METHOD_OFFSET)
1282 range_list
1283 = Fcons (Fcons (make_number (CHARSET_MIN_CHAR (charset)),
1284 make_number (CHARSET_MAX_CHAR (charset))),
1285 range_list);
1286 } 1286 }
1287 1287
1288 if (NILP (range_list)) 1288 if (NILP (range_list))
1289 error ("Invalid script or charset name: %s", 1289 error ("Invalid script or charset name: %s",
1290 XSYMBOL (character)->name->data); 1290 XSYMBOL (character)->name->data);