Contents in 1999-06-04-13 of release-21-2.

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

diff --git a/src/mule-ccl.c b/src/mule-ccl.c
index 6bf60e9..70f26a6 100644 (file)
--- a/src/mule-ccl.c
+++ b/src/mule-ccl.c
@@ -844,7 +844,7 @@ ccl_driver (struct ccl_program *ccl, CONST unsigned char *source, unsigned_char_
            case CCL_MOD: reg[rrr] = i % j; break;
            case CCL_AND: reg[rrr] = i & j; break;
            case CCL_OR: reg[rrr] = i | j; break;
            case CCL_MOD: reg[rrr] = i % j; break;
            case CCL_AND: reg[rrr] = i & j; break;
            case CCL_OR: reg[rrr] = i | j; break;

-           case CCL_XOR: reg[rrr] = i ^ j;; break;
+           case CCL_XOR: reg[rrr] = i ^ j; break;

            case CCL_LSH: reg[rrr] = i << j; break;
            case CCL_RSH: reg[rrr] = i >> j; break;
            case CCL_LSH8: reg[rrr] = (i << 8) | j; break;
            case CCL_LSH: reg[rrr] = i << j; break;
            case CCL_RSH: reg[rrr] = i >> j; break;
            case CCL_LSH8: reg[rrr] = (i << 8) | j; break;

@@ -1097,6 +1097,14 @@ Return index number of the registered CCL program.
 void
 syms_of_mule_ccl (void)
 {
 void
 syms_of_mule_ccl (void)
 {

+  DEFSUBR (Fccl_execute);
+  DEFSUBR (Fccl_execute_on_string);
+  DEFSUBR (Fregister_ccl_program);
+}
+
+void
+vars_of_mule_ccl (void)
+{

   staticpro (&Vccl_program_table);
   Vccl_program_table = Fmake_vector (make_int (32), Qnil);
 
   staticpro (&Vccl_program_table);
   Vccl_program_table = Fmake_vector (make_int (32), Qnil);
 

@@ -1113,10 +1121,6 @@ The code point in the font is set in CCL registers R1 and R2
 If the font is single-byte font, the register R2 is not used.
 */ );
   Vfont_ccl_encoder_alist = Qnil;
 If the font is single-byte font, the register R2 is not used.
 */ );
   Vfont_ccl_encoder_alist = Qnil;

-
-  DEFSUBR (Fccl_execute);
-  DEFSUBR (Fccl_execute_on_string);
-  DEFSUBR (Fregister_ccl_program);

 }
 
 #endif  /* emacs */
 }
 
 #endif  /* emacs */