Mercurial > emacs
changeset 100037:ad05ebb45618
(CHAR_CHARSET_P): Check if the encoder is loaded or
not before accessing it.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Sat, 29 Nov 2008 13:47:08 +0000 |
| parents | 638342cdddb4 |
| children | a368e04ccb9a |
| files | src/charset.h |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/charset.h Sat Nov 29 13:36:10 2008 +0000 +++ b/src/charset.h Sat Nov 29 13:47:08 2008 +0000 @@ -503,7 +503,8 @@ && ((charset)->method == CHARSET_METHOD_OFFSET \ ? (c) >= (charset)->min_char && (c) <= (charset)->max_char \ : ((charset)->method == CHARSET_METHOD_MAP \ - && (charset)->compact_codes_p) \ + && (charset)->compact_codes_p \ + && CHAR_TABLE_P (CHARSET_ENCODER (charset))) \ ? ! NILP (CHAR_TABLE_REF (CHARSET_ENCODER (charset), (c))) \ : encode_char ((charset), (c)) != (charset)->invalid_code))))