(insert-ideograph-radical-char-data): Ignore non-Unicode UCS

[chise/xemacs-chise.git] / src / chartab.c

diff --git a/src/chartab.c b/src/chartab.c
index 5d326c0..2d2db5a 100644 (file)
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -340,7 +340,6 @@ save_uint8_byte_table (Lisp_Uint8_Byte_Table *ct, Lisp_Char_Table* root,
                             Fprin1_to_string (UINT8_DECODE (ct->property[i]),
                                               Qnil),
                             db, Qt);
-             put_char_id_table (root, make_char (c), Qunloaded);
            }
        }
       else
@@ -652,7 +651,6 @@ save_uint16_byte_table (Lisp_Uint16_Byte_Table *ct, Lisp_Char_Table* root,
                             Fprin1_to_string (UINT16_DECODE (ct->property[i]),
                                               Qnil),
                             db, Qt);
-             put_char_id_table (root, make_char (c), Qunloaded);
            }
        }
       else
@@ -932,7 +930,6 @@ save_byte_table (Lisp_Byte_Table *ct, Lisp_Char_Table* root,
              Fput_database (Fprin1_to_string (make_char (c), Qnil),
                             Fprin1_to_string (v, Qnil),
                             db, Qt);
-             put_char_id_table (root, make_char (c), Qunloaded);
            }
        }
       else
@@ -3372,28 +3369,25 @@ Save values of ATTRIBUTE into database file.
   Lisp_Object table = Fgethash (attribute,
                                Vchar_attribute_hash_table, Qunbound);
   Lisp_Char_Table *ct;
+  Lisp_Object db_file;
+  Lisp_Object db;
 
   if (CHAR_TABLEP (table))
     ct = XCHAR_TABLE (table);
   else
     return Qnil;
 
-  if (NILP (Fdatabase_live_p (ct->db)))
-    {
-      Lisp_Object db_file = char_attribute_system_db_file (Qsystem_char_id, attribute, 1);
-
-      ct->db = Fopen_database (db_file, Qnil, Qnil, Qnil, Qnil);
-    }
-  if (!NILP (ct->db))
+  db_file = char_attribute_system_db_file (Qsystem_char_id, attribute, 1);
+  db = Fopen_database (db_file, Qnil, Qnil, build_string ("w+"), Qnil);
+  if (!NILP (db))
     {
       if (UINT8_BYTE_TABLE_P (ct->table))
-       save_uint8_byte_table (XUINT8_BYTE_TABLE(ct->table), ct, ct->db, 0, 3);
+       save_uint8_byte_table (XUINT8_BYTE_TABLE(ct->table), ct, db, 0, 3);
       else if (UINT16_BYTE_TABLE_P (ct->table))
-       save_uint16_byte_table (XUINT16_BYTE_TABLE(ct->table), ct, ct->db, 0, 3);
+       save_uint16_byte_table (XUINT16_BYTE_TABLE(ct->table), ct, db, 0, 3);
       else if (BYTE_TABLE_P (ct->table))
-       save_byte_table (XBYTE_TABLE(ct->table), ct, ct->db, 0, 3);
-      Fclose_database (ct->db);
-      ct->db = Qnil;
+       save_byte_table (XBYTE_TABLE(ct->table), ct, db, 0, 3);
+      Fclose_database (db);
       return Qt;
     }
   else
@@ -3403,6 +3397,32 @@ Save values of ATTRIBUTE into database file.
 #endif
 }
 
+DEFUN ("mount-char-attribute-table", Fmount_char_attribute_table, 1, 1, 0, /*
+Mount database file on char-attribute-table ATTRIBUTE.
+*/
+       (attribute))
+{
+#ifdef HAVE_DATABASE
+  Lisp_Object table = Fgethash (attribute,
+                               Vchar_attribute_hash_table, Qunbound);
+
+  if (UNBOUNDP (table))
+    {
+      Lisp_Char_Table *ct;
+
+      table = make_char_id_table (Qunbound);
+      Fputhash (attribute, table, Vchar_attribute_hash_table);
+      XCHAR_TABLE_NAME(table) = attribute;
+      ct = XCHAR_TABLE (table);
+      ct->table = Qunloaded;
+      XCHAR_TABLE_UNLOADED(table) = 1;
+      ct->db = Qnil;
+      return Qt;
+    }
+#endif
+  return Qnil;
+}
+
 DEFUN ("close-char-attribute-table", Fclose_char_attribute_table, 1, 1, 0, /*
 Close database of ATTRIBUTE.
 */
@@ -3473,7 +3493,7 @@ load_char_attribute_maybe (Lisp_Char_Table* cit, Emchar ch)
          Lisp_Object db_file
            = char_attribute_system_db_file (Qsystem_char_id, attribute, 0);
 
-         cit->db = Fopen_database (db_file, Qnil, Qnil, Qnil, Qnil);
+         cit->db = Fopen_database (db_file, Qnil, Qnil, build_string ("r"), Qnil);
        }
       if (!NILP (cit->db))
        {
@@ -3528,7 +3548,7 @@ Load values of ATTRIBUTE into database file.
          Lisp_Object db_file
              = char_attribute_system_db_file (Qsystem_char_id, attribute, 0);
 
-         ct->db = Fopen_database (db_file, Qnil, Qnil, Qnil, Qnil);
+         ct->db = Fopen_database (db_file, Qnil, Qnil, build_string ("r"), Qnil);
        }
       if (!NILP (ct->db))
        {
@@ -4070,6 +4090,7 @@ syms_of_chartab (void)
   defsymbol (&Qput_char_table_map_function, "put-char-table-map-function");
   DEFSUBR (Fput_char_table_map_function);
   DEFSUBR (Fsave_char_attribute_table);
+  DEFSUBR (Fmount_char_attribute_table);
   DEFSUBR (Freset_char_attribute_table);
   DEFSUBR (Fclose_char_attribute_table);
 #ifdef HAVE_DATABASE