Mercurial > emacs
comparison src/fontset.c @ 29011:b60861d6c1e0
(fontset_ref): Use SPLIT_CHAR instead of
SPLIT_NON_ASCII_CHAR.
(fontset_ref_via_base, fontset_set): Likewise
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Sat, 20 May 2000 00:00:49 +0000 |
parents | a7bbac783196 |
children | 3c444d185d31 |
comparison
equal
deleted
inserted
replaced
29010:f62cfa81b0c4 | 29011:b60861d6c1e0 |
---|---|
221 int i; | 221 int i; |
222 | 222 |
223 if (SINGLE_BYTE_CHAR_P (c)) | 223 if (SINGLE_BYTE_CHAR_P (c)) |
224 return FONTSET_ASCII (fontset); | 224 return FONTSET_ASCII (fontset); |
225 | 225 |
226 SPLIT_NON_ASCII_CHAR (c, charset, c1, c2); | 226 SPLIT_CHAR (c, charset, c1, c2); |
227 elt = XCHAR_TABLE (fontset)->contents[charset + 128]; | 227 elt = XCHAR_TABLE (fontset)->contents[charset + 128]; |
228 if (!SUB_CHAR_TABLE_P (elt)) | 228 if (!SUB_CHAR_TABLE_P (elt)) |
229 return elt; | 229 return elt; |
230 defalt = XCHAR_TABLE (elt)->defalt; | 230 defalt = XCHAR_TABLE (elt)->defalt; |
231 if (c1 < 32 | 231 if (c1 < 32 |
259 elt = FONTSET_REF (FONTSET_BASE (fontset), *c); | 259 elt = FONTSET_REF (FONTSET_BASE (fontset), *c); |
260 if (NILP (elt)) | 260 if (NILP (elt)) |
261 return Qnil; | 261 return Qnil; |
262 | 262 |
263 *c = XINT (XCAR (elt)); | 263 *c = XINT (XCAR (elt)); |
264 SPLIT_NON_ASCII_CHAR (*c, charset, c1, c2); | 264 SPLIT_CHAR (*c, charset, c1, c2); |
265 elt = XCHAR_TABLE (fontset)->contents[charset + 128]; | 265 elt = XCHAR_TABLE (fontset)->contents[charset + 128]; |
266 if (c1 < 32) | 266 if (c1 < 32) |
267 return (SUB_CHAR_TABLE_P (elt) ? XCHAR_TABLE (elt)->defalt : elt); | 267 return (SUB_CHAR_TABLE_P (elt) ? XCHAR_TABLE (elt)->defalt : elt); |
268 if (!SUB_CHAR_TABLE_P (elt)) | 268 if (!SUB_CHAR_TABLE_P (elt)) |
269 return Qnil; | 269 return Qnil; |
294 { | 294 { |
295 FONTSET_ASCII (fontset) = newelt; | 295 FONTSET_ASCII (fontset) = newelt; |
296 return; | 296 return; |
297 } | 297 } |
298 | 298 |
299 SPLIT_NON_ASCII_CHAR (c, charset, code[0], code[1]); | 299 SPLIT_CHAR (c, charset, code[0], code[1]); |
300 code[2] = 0; /* anchor */ | 300 code[2] = 0; /* anchor */ |
301 elt = &XCHAR_TABLE (fontset)->contents[charset + 128]; | 301 elt = &XCHAR_TABLE (fontset)->contents[charset + 128]; |
302 for (i = 0; code[i] > 0; i++) | 302 for (i = 0; code[i] > 0; i++) |
303 { | 303 { |
304 if (!SUB_CHAR_TABLE_P (*elt)) | 304 if (!SUB_CHAR_TABLE_P (*elt)) |