(encode_coding_ucs4): Don't implement in UTF2000.

(decode_coding_iso2022): Don't use XCHARSET_DIMENSION in UTF2000.

diff --git a/src/file-coding.c b/src/file-coding.c
index 34891b1..898d530 100644 (file)
--- a/src/file-coding.c
+++ b/src/file-coding.c
@@ -3575,6 +3575,7 @@ static void
 encode_coding_ucs4 (Lstream *encoding, CONST unsigned char *src,
                    unsigned_char_dynarr *dst, unsigned int n)
 {
+#ifndef UTF2000
   struct encoding_stream *str = ENCODING_STREAM_DATA (encoding);
   unsigned int flags = str->flags;
   unsigned int ch = str->ch;
@@ -3703,6 +3704,7 @@ encode_coding_ucs4 (Lstream *encoding, CONST unsigned char *src,
   str->iso2022.current_charset = charset;
 
   /* Verbum caro factum est! */
+#endif
 }
 
 \f
@@ -5022,7 +5024,11 @@ decode_coding_iso2022 (Lstream *decoding, CONST unsigned char *src,
                  break;
 
                case 3: /* one-byte private or two-byte official */
+#ifdef UTF2000
+                 if (XCHARSET_DIMENSION (charset) == 1)
+#else
                  if (XCHARSET_PRIVATE_P (charset))
+#endif
                    {
                      DECODE_OUTPUT_PARTIAL_CHAR (ch);
 #ifdef UTF2000