diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-15 11:57:45 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-15 11:57:45 -0700 |
| commit | a2a0186171731765ee67d24a29fb80f54cd874f0 (patch) | |
| tree | 7ca9924f10b11d9ed599cfcdf01102e5d6b4235f /src/charset.h | |
| parent | dfc926249a7d14f037a01acba7a69339661e5107 (diff) | |
| download | emacs-a2a0186171731765ee67d24a29fb80f54cd874f0.tar.gz | |
* character.h, charset.h: Use verify_expr, not verify_true.
Diffstat (limited to 'src/charset.h')
| -rw-r--r-- | src/charset.h | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/src/charset.h b/src/charset.h index 24f0fc46dec..c2a52a38e7e 100644 --- a/src/charset.h +++ b/src/charset.h @@ -426,29 +426,30 @@ extern Lisp_Object charset_work; /* Return a code point of CHAR in CHARSET. Try some optimization before calling encode_char. */ -#define ENCODE_CHAR(charset, c) \ - ((ASCII_CHAR_P (c) && (charset)->ascii_compatible_p) \ - ? (c) \ - : (!verify_true (sizeof (c) <= sizeof (int)) \ - || (charset)->unified_p \ - || (charset)->method == CHARSET_METHOD_SUBSET \ - || (charset)->method == CHARSET_METHOD_SUPERSET) \ - ? encode_char ((charset), (c)) \ - : ((c) < (charset)->min_char || (c) > (charset)->max_char) \ - ? (charset)->invalid_code \ - : (charset)->method == CHARSET_METHOD_OFFSET \ - ? ((charset)->code_linear_p \ - ? (c) - (charset)->code_offset + (charset)->min_code \ - : encode_char ((charset), (c))) \ - : (charset)->method == CHARSET_METHOD_MAP \ - ? (((charset)->compact_codes_p \ - && CHAR_TABLE_P (CHARSET_ENCODER (charset))) \ - ? (charset_work = CHAR_TABLE_REF (CHARSET_ENCODER (charset), (c)), \ - (NILP (charset_work) \ - ? (charset)->invalid_code \ - : XFASTINT (charset_work))) \ - : encode_char ((charset), (c))) \ - : encode_char ((charset), (c))) +#define ENCODE_CHAR(charset, c) \ + (verify_expr \ + (sizeof (c) <= sizeof (int), \ + (ASCII_CHAR_P (c) && (charset)->ascii_compatible_p \ + ? (c) \ + : ((charset)->unified_p \ + || (charset)->method == CHARSET_METHOD_SUBSET \ + || (charset)->method == CHARSET_METHOD_SUPERSET) \ + ? encode_char (charset, c) \ + : (c) < (charset)->min_char || (c) > (charset)->max_char \ + ? (charset)->invalid_code \ + : (charset)->method == CHARSET_METHOD_OFFSET \ + ? ((charset)->code_linear_p \ + ? (c) - (charset)->code_offset + (charset)->min_code \ + : encode_char (charset, c)) \ + : (charset)->method == CHARSET_METHOD_MAP \ + ? (((charset)->compact_codes_p \ + && CHAR_TABLE_P (CHARSET_ENCODER (charset))) \ + ? (charset_work = CHAR_TABLE_REF (CHARSET_ENCODER (charset), c), \ + (NILP (charset_work) \ + ? (charset)->invalid_code \ + : XFASTINT (charset_work))) \ + : encode_char (charset, c)) \ + : encode_char (charset, c)))) /* Set to 1 when a charset map is loaded to warn that a buffer text |