diff options
| author | Kenichi Handa | 2000-05-20 00:00:49 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2000-05-20 00:00:49 +0000 |
| commit | f55d03b19bb2e9ff3b2c88bbd93d49a89d0d543b (patch) | |
| tree | 624b5f031b1e5f2c0e5e4a9136678da7974d7ecb | |
| parent | 2efdd1b92e19b2db5ae036673f4031d55115aa79 (diff) | |
| download | emacs-f55d03b19bb2e9ff3b2c88bbd93d49a89d0d543b.tar.gz emacs-f55d03b19bb2e9ff3b2c88bbd93d49a89d0d543b.zip | |
(fontset_ref): Use SPLIT_CHAR instead of
SPLIT_NON_ASCII_CHAR.
(fontset_ref_via_base, fontset_set): Likewise
| -rw-r--r-- | src/fontset.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fontset.c b/src/fontset.c index ef8c2574b47..a9ee2c1e615 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -223,7 +223,7 @@ fontset_ref (fontset, c) | |||
| 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; |
| @@ -261,7 +261,7 @@ fontset_ref_via_base (fontset, c) | |||
| 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); |
| @@ -296,7 +296,7 @@ fontset_set (fontset, c, 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++) |