(x-complement-fontset-spec): Use

[bpt/emacs.git] / src / ccl.c

diff --git a/src/ccl.c b/src/ccl.c
index c13f7c8..5e4a663 100644 (file)
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -13,7 +13,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -673,13 +673,13 @@ while (0)
 
 #define CCL_LookupIntConstTbl 0x13 /* Lookup multibyte character by
                                      integer key.  Afterwards R7 set
-                                     to 1 iff lookup succeeded.
+                                     to 1 if lookup succeeded.
                                      1:ExtendedCOMMNDRrrRRRXXXXXXXX
                                      2:ARGUMENT(Hash table ID) */
 
 #define CCL_LookupCharConstTbl 0x14 /* Lookup integer by multibyte
                                       character key.  Afterwards R7 set
-                                      to 1 iff lookup succeeded.
+                                      to 1 if lookup succeeded.
                                       1:ExtendedCOMMNDRrrRRRrrrXXXXX
                                       2:ARGUMENT(Hash table ID) */
 
@@ -1222,7 +1222,7 @@ ccl_driver (ccl, source, destination, src_size, dst_size, charset_list)
            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;
@@ -2245,16 +2245,8 @@ Return index number of the registered CCL program.  */)
     }
 
   if (idx == len)
-    {
-      /* Extend the table.  */
-      Lisp_Object new_table;
-      int j;
-
-      new_table = Fmake_vector (make_number (len * 2), Qnil);
-      for (j = 0; j < len; j++)
-       ASET (new_table, j, AREF (Vccl_program_table, j));
-      Vccl_program_table = new_table;
-    }
+    /* Extend the table.  */
+    Vccl_program_table = larger_vector (Vccl_program_table, len * 2, Qnil);
 
   {
     Lisp_Object elt;
@@ -2313,15 +2305,8 @@ Return index number of the registered map.  */)
     }
 
   if (i == len)
-    {
-      Lisp_Object new_vector = Fmake_vector (make_number (len * 2), Qnil);
-      int j;
-
-      for (j = 0; j < len; j++)
-       AREF (new_vector, j)
-         = AREF (Vcode_conversion_map_vector, j);
-      Vcode_conversion_map_vector = new_vector;
-    }
+    Vcode_conversion_map_vector = larger_vector (Vcode_conversion_map_vector,
+                                                len * 2, Qnil);
 
   index = make_number (i);
   Fput (symbol, Qcode_conversion_map, map);