(ENCODE_CHAR): If the method is SUBSET or SUPERSET, call encode_char.

diff --git a/src/ChangeLog b/src/ChangeLog
index b7b3e86a00fe13bc61f3fa435d8623ecfba79aaa..aa77e0b28eb73a9850b3e08cbeefbc75b2cb7e1b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2003-01-11  Kenichi Handa  <handa@m17n.org>
 
+       * charset.h (ENCODE_CHAR): If the method is SUBSET or SUPERSET,
+       call encode_char.
+
+       * charset.c (encode_char): Fix handling of methods SUBSET and
+       SUPERSET.
+
        * xterm.c (x_new_fontset): Fix previous change.
 
 2003-01-10  Dave Love  <fx@gnu.org>

diff --git a/src/charset.h b/src/charset.h
index dd8a872a32861e7a84c15312b824be6c365cc6e1..6db0165274a597b6548568cad71b57e66d8291bd 100644 (file)
--- a/src/charset.h
+++ b/src/charset.h
@@ -421,7 +421,9 @@ extern Lisp_Object charset_work;
 #define ENCODE_CHAR(charset, c)                                                 \
   ((ASCII_CHAR_P (c) && (charset)->ascii_compatible_p)                  \
    ? (c)                                                                \
-   : (charset)->unified_p                                               \
+   : ((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                                            \