diff options
| author | Kenichi Handa | 1999-09-08 11:49:34 +0000 |
|---|---|---|
| committer | Kenichi Handa | 1999-09-08 11:49:34 +0000 |
| commit | 63f4d579144e66fbe789262347bd6b53217e372d (patch) | |
| tree | b2bc6688a9e4a23ff9666c3918d810e86c070af1 /src | |
| parent | 0ad3f83d15da1a73dc58370be01fd17e82decf38 (diff) | |
| download | emacs-63f4d579144e66fbe789262347bd6b53217e372d.tar.gz emacs-63f4d579144e66fbe789262347bd6b53217e372d.zip | |
(CHAR_COMPONENTS_VALID_P): Fix for ASCII.
Diffstat (limited to 'src')
| -rw-r--r-- | src/charset.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/charset.c b/src/charset.c index 66d53003b0d..61fdcf66ef5 100644 --- a/src/charset.c +++ b/src/charset.c | |||
| @@ -212,9 +212,11 @@ invalid_character (c) | |||
| 212 | 212 | ||
| 213 | /* 1 if CHARSET, C1, and C2 compose a valid character, else 0. */ | 213 | /* 1 if CHARSET, C1, and C2 compose a valid character, else 0. */ |
| 214 | #define CHAR_COMPONENTS_VALID_P(charset, c1, c2) \ | 214 | #define CHAR_COMPONENTS_VALID_P(charset, c1, c2) \ |
| 215 | (CHARSET_DIMENSION (charset) == 1 \ | 215 | (charset == CHARSET_ASCII \ |
| 216 | ? ((c1) >= 0x20 && (c1) <= 0x7F) \ | 216 | ? ((c1) >= 0 && (c1) <= 0x7F) \ |
| 217 | : ((c1) >= 0x20 && (c1) <= 0x7F && (c2) >= 0x20 && (c2) <= 0x7F)) | 217 | : (CHARSET_DIMENSION (charset) == 1 \ |
| 218 | ? ((c1) >= 0x20 && (c1) <= 0x7F) \ | ||
| 219 | : ((c1) >= 0x20 && (c1) <= 0x7F && (c2) >= 0x20 && (c2) <= 0x7F))) | ||
| 218 | 220 | ||
| 219 | /* Set STR a pointer to the multi-byte form of the character C. If C | 221 | /* Set STR a pointer to the multi-byte form of the character C. If C |
| 220 | is not a composite character, the multi-byte form is set in WORKBUF | 222 | is not a composite character, the multi-byte form is set in WORKBUF |