(C6-3930): Add M-17478.

[chise/xemacs-chise.git-] / src / mule-ccl.c

diff --git a/src/mule-ccl.c b/src/mule-ccl.c
index 4d6aff2..d47c258 100644 (file)
--- a/src/mule-ccl.c
+++ b/src/mule-ccl.c
@@ -34,7 +34,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include "lisp.h"
 #include "buffer.h"
-#include "mule-charset.h"
+#include "character.h"
 #include "mule-ccl.h"
 #include "file-coding.h"
 
@@ -430,7 +430,7 @@ Lisp_Object Vccl_program_table;
                                        extended_command (rrr,RRR,Rrr,ARGS)
                                      */
 
-/* 
+/*
    Here after, Extended CCL Instructions.
    Bit length of extended command is 14.
    Therefore, the instruction code range is 0..16384(0x3fff).
@@ -489,7 +489,7 @@ Lisp_Object Vccl_program_table;
                                        3:MAP-ID1
                                        4:MAP-ID2
                                        ...
-                                    */ 
+                                    */
 
 /* Map the code in reg[rrr] by MAPs starting from the Nth (N =
    reg[RRR]) map.
@@ -560,7 +560,7 @@ Lisp_Object Vccl_program_table;
    where
        STARTPOINT is an offset to be used for indexing a map,
        ENDPOINT is a maximum index number of a map,
-       VAL and VALn is a number, nil, t, or lambda.  
+       VAL and VALn is a number, nil, t, or lambda.
 
    Valid index range of a map of type (a) is:
        STARTPOINT <= index < STARTPOINT + map_size - 1
@@ -752,7 +752,7 @@ struct ccl_prog_stack
     int ic;                    /* Instruction Counter.  */
   };
 
-/* For the moment, we only support depth 256 of stack.  */ 
+/* For the moment, we only support depth 256 of stack.  */
 static struct ccl_prog_stack ccl_prog_stack_struct[256];
 
 int
@@ -1127,6 +1127,7 @@ ccl_driver (struct ccl_program *ccl, const unsigned char *source,
        case CCL_Extension:
          switch (EXCMD)
            {
+#ifndef UTF2000
            case CCL_ReadMultibyteChar2:
              if (!src)
                CCL_INVALID_CMD;
@@ -1137,7 +1138,7 @@ ccl_driver (struct ccl_program *ccl, const unsigned char *source,
                    src++;
                    goto ccl_read_multibyte_character_suspend;
                  }
-             
+
                i = *src++;
 #if 0
                if (i == LEADING_CODE_COMPOSITION)
@@ -1240,7 +1241,9 @@ ccl_driver (struct ccl_program *ccl, const unsigned char *source,
                CCL_SUSPEND (CCL_STAT_SUSPEND_BY_SRC);
 
              break;
+#endif
 
+#ifndef UTF2000
            case CCL_WriteMultibyteChar2:
              i = reg[RRR]; /* charset */
              if (i == LEADING_BYTE_ASCII)
@@ -1260,6 +1263,7 @@ ccl_driver (struct ccl_program *ccl, const unsigned char *source,
              CCL_WRITE_CHAR (i);
 
              break;
+#endif
 
 #if 0
            case CCL_TranslateCharacter:
@@ -1283,7 +1287,7 @@ ccl_driver (struct ccl_program *ccl, const unsigned char *source,
              SPLIT_CHAR (op, reg[RRR], i, j);
              if (j != -1)
                i = (i << 7) | j;
-             
+
              reg[rrr] = i;
              break;
 
@@ -1309,7 +1313,7 @@ ccl_driver (struct ccl_program *ccl, const unsigned char *source,
              SPLIT_CHAR (op, reg[RRR], i, j);
              if (j != -1)
                i = (i << 7) | j;
-             
+
              reg[rrr] = i;
              break;
 
@@ -1370,7 +1374,7 @@ ccl_driver (struct ccl_program *ccl, const unsigned char *source,
                        else
                          continue;
                      }
-                   else 
+                   else
                      continue;
 
                    if (NILP (content))
@@ -1402,7 +1406,7 @@ ccl_driver (struct ccl_program *ccl, const unsigned char *source,
                ic = fin_ic;
              }
              break;
-             
+
            case CCL_MapMultiple:
              {
                Lisp_Object map, content, attrib, value;
@@ -1479,7 +1483,7 @@ ccl_driver (struct ccl_program *ccl, const unsigned char *source,
                        else
                          continue;
                      }
-                   else 
+                   else
                      continue;
 
                    if (NILP (content))
@@ -1575,7 +1579,7 @@ ccl_driver (struct ccl_program *ccl, const unsigned char *source,
              }
              break;
 #endif
-             
+
            default:
              CCL_INVALID_CMD;
            }
@@ -1919,7 +1923,7 @@ Return index number of the registered CCL program.
    The rest elements are mapped numbers.
    Symbol t means to map to an original number before mapping.
    Symbol nil means that the corresponding element is empty.
-   Symbol lambda menas to terminate mapping here.
+   Symbol lambda means to terminate mapping here.
 */
 
 DEFUN ("register-code-conversion-map", Fregister_code_conversion_map,
@@ -1936,7 +1940,7 @@ Return index number of the registered map.")
 
   CHECK_SYMBOL (symbol, 0);
   CHECK_VECTOR (map, 1);
-  
+
   for (i = 0; i < len; i++)
     {
       Lisp_Object slot = XVECTOR (Vcode_conversion_map_vector)->contents[i];