diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/charset.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/charset.c b/src/charset.c index b691cc9da65..2d5c3b75c81 100644 --- a/src/charset.c +++ b/src/charset.c | |||
| @@ -233,7 +233,7 @@ char_to_string_1 (c, str) | |||
| 233 | ? LEADING_CODE_PRIVATE_21 | 233 | ? LEADING_CODE_PRIVATE_21 |
| 234 | : LEADING_CODE_PRIVATE_22))); | 234 | : LEADING_CODE_PRIVATE_22))); |
| 235 | *p++ = charset; | 235 | *p++ = charset; |
| 236 | if (c1 > 0 && c1 < 32 || c2 > 0 && c2 < 32) | 236 | if ((c1 > 0 && c1 < 32) || (c2 > 0 && c2 < 32)) |
| 237 | return -1; | 237 | return -1; |
| 238 | if (c1) | 238 | if (c1) |
| 239 | { | 239 | { |
| @@ -377,7 +377,7 @@ translate_char (table, c, charset, c1, c2) | |||
| 377 | 377 | ||
| 378 | SPLIT_CHAR (XFASTINT (ch), alt_charset, alt_c1, alt_c2); | 378 | SPLIT_CHAR (XFASTINT (ch), alt_charset, alt_c1, alt_c2); |
| 379 | dimension = CHARSET_DIMENSION (alt_charset); | 379 | dimension = CHARSET_DIMENSION (alt_charset); |
| 380 | if (dimension == 1 && alt_c1 > 0 || dimension == 2 && alt_c2 > 0) | 380 | if ((dimension == 1 && alt_c1 > 0) || (dimension == 2 && alt_c2 > 0)) |
| 381 | /* CH is not a generic character, just return it. */ | 381 | /* CH is not a generic character, just return it. */ |
| 382 | return XFASTINT (ch); | 382 | return XFASTINT (ch); |
| 383 | 383 | ||
| @@ -686,7 +686,7 @@ DESCRIPTION (string) is the description string of the charset. */) | |||
| 686 | || !INTEGERP (vec[2]) || !(XINT (vec[2]) == 1 || XINT (vec[2]) == 2) | 686 | || !INTEGERP (vec[2]) || !(XINT (vec[2]) == 1 || XINT (vec[2]) == 2) |
| 687 | || !INTEGERP (vec[3]) || !(XINT (vec[3]) == 0 || XINT (vec[3]) == 1) | 687 | || !INTEGERP (vec[3]) || !(XINT (vec[3]) == 0 || XINT (vec[3]) == 1) |
| 688 | || !INTEGERP (vec[4]) | 688 | || !INTEGERP (vec[4]) |
| 689 | || !(XINT (vec[4]) == -1 || XINT (vec[4]) >= '0' && XINT (vec[4]) <= '~') | 689 | || !(XINT (vec[4]) == -1 || (XINT (vec[4]) >= '0' && XINT (vec[4]) <= '~')) |
| 690 | || !INTEGERP (vec[5]) | 690 | || !INTEGERP (vec[5]) |
| 691 | || !(XINT (vec[5]) == -1 || XINT (vec[5]) == 0 || XINT (vec[5]) == 1) | 691 | || !(XINT (vec[5]) == -1 || XINT (vec[5]) == 0 || XINT (vec[5]) == 1) |
| 692 | || !STRINGP (vec[6]) | 692 | || !STRINGP (vec[6]) |