# HG changeset patch # User Pavel Jank # Date 1007859319 0 # Node ID 9965a3b286607dd191be32c93c1488cafb716c98 # Parent 665e7cb4204bbe629ea4784a565b93d809b0aab7 (char_to_string_1, translate_char, Fdefine_charset): Add parentheses around && within ||. diff -r 665e7cb4204b -r 9965a3b28660 src/charset.c --- a/src/charset.c Sat Dec 08 21:08:03 2001 +0000 +++ b/src/charset.c Sun Dec 09 00:55:19 2001 +0000 @@ -233,7 +233,7 @@ ? LEADING_CODE_PRIVATE_21 : LEADING_CODE_PRIVATE_22))); *p++ = charset; - if (c1 > 0 && c1 < 32 || c2 > 0 && c2 < 32) + if ((c1 > 0 && c1 < 32) || (c2 > 0 && c2 < 32)) return -1; if (c1) { @@ -377,7 +377,7 @@ SPLIT_CHAR (XFASTINT (ch), alt_charset, alt_c1, alt_c2); dimension = CHARSET_DIMENSION (alt_charset); - if (dimension == 1 && alt_c1 > 0 || dimension == 2 && alt_c2 > 0) + if ((dimension == 1 && alt_c1 > 0) || (dimension == 2 && alt_c2 > 0)) /* CH is not a generic character, just return it. */ return XFASTINT (ch); @@ -686,7 +686,7 @@ || !INTEGERP (vec[2]) || !(XINT (vec[2]) == 1 || XINT (vec[2]) == 2) || !INTEGERP (vec[3]) || !(XINT (vec[3]) == 0 || XINT (vec[3]) == 1) || !INTEGERP (vec[4]) - || !(XINT (vec[4]) == -1 || XINT (vec[4]) >= '0' && XINT (vec[4]) <= '~') + || !(XINT (vec[4]) == -1 || (XINT (vec[4]) >= '0' && XINT (vec[4]) <= '~')) || !INTEGERP (vec[5]) || !(XINT (vec[5]) == -1 || XINT (vec[5]) == 0 || XINT (vec[5]) == 1) || !STRINGP (vec[6])