(bufbyte_string_displayed_columns): Use `CHAR_COLUMNS' instead of

[chise/xemacs-chise.git-] / src / file-coding.c

diff --git a/src/file-coding.c b/src/file-coding.c
index 34891b1..adfc45f 100644 (file)
--- a/src/file-coding.c
+++ b/src/file-coding.c
@@ -3241,6 +3241,7 @@ static void
 encode_coding_big5 (Lstream *encoding, CONST unsigned char *src,
                    unsigned_char_dynarr *dst, unsigned int n)
 {
+#ifndef UTF2000
   unsigned char c;
   struct encoding_stream *str = ENCODING_STREAM_DATA (encoding);
   unsigned int flags  = str->flags;
@@ -3295,6 +3296,7 @@ encode_coding_big5 (Lstream *encoding, CONST unsigned char *src,
 
   str->flags = flags;
   str->ch    = ch;
+#endif
 }
 
 
@@ -3315,7 +3317,7 @@ Return the corresponding character.
   if (BYTE_BIG5_TWO_BYTE_1_P (b1) &&
       BYTE_BIG5_TWO_BYTE_2_P (b2))
     {
-      int leading_byte;
+      Charset_ID leading_byte;
       Lisp_Object charset;
       DECODE_BIG5 (b1, b2, leading_byte, c1, c2);
       charset = CHARSET_BY_LEADING_BYTE (leading_byte);
@@ -3575,6 +3577,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 +3706,7 @@ encode_coding_ucs4 (Lstream *encoding, CONST unsigned char *src,
   str->iso2022.current_charset = charset;
 
   /* Verbum caro factum est! */
+#endif
 }
 
 \f
@@ -4957,7 +4961,7 @@ decode_coding_iso2022 (Lstream *decoding, CONST unsigned char *src,
        {                       /* Graphic characters */
          Lisp_Object charset;
 #ifndef UTF2000
-         int lb;
+         Charset_ID lb;
 #endif
          int reg;
 
@@ -5022,7 +5026,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