summaryrefslogtreecommitdiff
path: root/src/charset.c
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>1999-09-08 11:49:34 +0000
committerKenichi Handa <handa@m17n.org>1999-09-08 11:49:34 +0000
commit63f4d579144e66fbe789262347bd6b53217e372d (patch)
treeb2bc6688a9e4a23ff9666c3918d810e86c070af1 /src/charset.c
parent0ad3f83d15da1a73dc58370be01fd17e82decf38 (diff)
downloademacs-63f4d579144e66fbe789262347bd6b53217e372d.tar.gz
(CHAR_COMPONENTS_VALID_P): Fix for ASCII.
Diffstat (limited to 'src/charset.c')
-rw-r--r--src/charset.c8
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)
/* 1 if CHARSET, C1, and C2 compose a valid character, else 0. */
#define CHAR_COMPONENTS_VALID_P(charset, c1, c2) \
- (CHARSET_DIMENSION (charset) == 1 \
- ? ((c1) >= 0x20 && (c1) <= 0x7F) \
- : ((c1) >= 0x20 && (c1) <= 0x7F && (c2) >= 0x20 && (c2) <= 0x7F))
+ (charset == CHARSET_ASCII \
+ ? ((c1) >= 0 && (c1) <= 0x7F) \
+ : (CHARSET_DIMENSION (charset) == 1 \
+ ? ((c1) >= 0x20 && (c1) <= 0x7F) \
+ : ((c1) >= 0x20 && (c1) <= 0x7F && (c2) >= 0x20 && (c2) <= 0x7F)))
/* Set STR a pointer to the multi-byte form of the character C. If C
is not a composite character, the multi-byte form is set in WORKBUF