[Emacs-diffs] emacs/src charset.h

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/11/29 13:47:09

Modified files:
        src            : charset.h 

Log message:
        (CHAR_CHARSET_P): Check if the encoder is loaded or
        not before accessing it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/charset.h?cvsroot=emacs&r1=1.95&r2=1.96

Patches:
Index: charset.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/charset.h,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- charset.h   27 Nov 2008 08:00:43 -0000      1.95
+++ charset.h   29 Nov 2008 13:47:08 -0000      1.96
@@ -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))))