From: Kenichi Handa Date: Wed, 8 Sep 1999 11:49:34 +0000 (+0000) Subject: (CHAR_COMPONENTS_VALID_P): Fix for ASCII. X-Git-Tag: emacs-pretest-21.0.90~6831 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=63f4d579144e66fbe789262347bd6b53217e372d;p=emacs.git (CHAR_COMPONENTS_VALID_P): Fix for ASCII. --- 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