diff options
| author | Kenichi Handa | 1998-11-06 00:44:16 +0000 |
|---|---|---|
| committer | Kenichi Handa | 1998-11-06 00:44:16 +0000 |
| commit | d6127b83e30a19373ca2d50c8fd4cbb07ab9b962 (patch) | |
| tree | b213afb266ddee7c496a40dfdbb909c0e530d094 /src | |
| parent | a688bb2444e34a484d013400e6e5e6f5afdd9550 (diff) | |
| download | emacs-d6127b83e30a19373ca2d50c8fd4cbb07ab9b962.tar.gz emacs-d6127b83e30a19373ca2d50c8fd4cbb07ab9b962.zip | |
(MAKE_NON_ASCII_CHAR): Check validity of CHARSET.
Diffstat (limited to 'src')
| -rw-r--r-- | src/charset.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/charset.h b/src/charset.h index f03bb944811..1b33b972811 100644 --- a/src/charset.h +++ b/src/charset.h | |||
| @@ -449,13 +449,13 @@ extern int width_by_char_head[256]; | |||
| 449 | 449 | ||
| 450 | /* Return a non-ASCII character of which charset is CHARSET and | 450 | /* Return a non-ASCII character of which charset is CHARSET and |
| 451 | position-codes are C1 and C2. DIMENSION1 character ignores C2. */ | 451 | position-codes are C1 and C2. DIMENSION1 character ignores C2. */ |
| 452 | #define MAKE_NON_ASCII_CHAR(charset, c1, c2) \ | 452 | #define MAKE_NON_ASCII_CHAR(charset, c1, c2) \ |
| 453 | ((charset) == CHARSET_COMPOSITION \ | 453 | ((charset) == CHARSET_COMPOSITION \ |
| 454 | ? MAKE_COMPOSITE_CHAR (((c1) << 7) + (c2)) \ | 454 | ? MAKE_COMPOSITE_CHAR (((c1) << 7) + (c2)) \ |
| 455 | : (CHARSET_DIMENSION (charset) == 1 \ | 455 | : (! CHARSET_DEFINED_P (charset) || CHARSET_DIMENSION (charset) == 1 \ |
| 456 | ? (((charset) - 0x70) << 7) | (c1) \ | 456 | ? (((charset) - 0x70) << 7) | (c1) \ |
| 457 | : ((charset) < MIN_CHARSET_PRIVATE_DIMENSION2 \ | 457 | : ((charset) < MIN_CHARSET_PRIVATE_DIMENSION2 \ |
| 458 | ? (((charset) - 0x8F) << 14) | ((c1) << 7) | (c2) \ | 458 | ? (((charset) - 0x8F) << 14) | ((c1) << 7) | (c2) \ |
| 459 | : (((charset) - 0xE0) << 14) | ((c1) << 7) | (c2)))) | 459 | : (((charset) - 0xE0) << 14) | ((c1) << 7) | (c2)))) |
| 460 | 460 | ||
| 461 | /* Return a composite character of which CMPCHAR-ID is ID. */ | 461 | /* Return a composite character of which CMPCHAR-ID is ID. */ |