X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fchartab.c;h=cd306198feefe4bbc8e580d7f46a78bfed8dc312;hb=1aa5d6b7bb3b343fbcc650c0c3befed77f1e5045;hp=e941464022e0576e0d4d5d13359e9c21062ffe14;hpb=a8607b4c684260f2e9ee2b547652efe62e865979;p=chise%2Fxemacs-chise.git-

diff --git a/src/chartab.c b/src/chartab.c
index e941464..cd30619 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -190,12 +190,16 @@ uint8_byte_table_hash (Lisp_Object obj, int depth)
   return hash;
 }
 
+static const struct lrecord_description uint8_byte_table_description[] = {
+  { XD_END }
+};
+
 DEFINE_LRECORD_IMPLEMENTATION ("uint8-byte-table", uint8_byte_table,
                                mark_uint8_byte_table,
 			       print_uint8_byte_table,
 			       0, uint8_byte_table_equal,
 			       uint8_byte_table_hash,
-			       0 /* uint8_byte_table_description */,
+			       uint8_byte_table_description,
 			       Lisp_Uint8_Byte_Table);
 
 static Lisp_Object
@@ -415,12 +419,16 @@ uint16_byte_table_hash (Lisp_Object obj, int depth)
   return hash;
 }
 
+static const struct lrecord_description uint16_byte_table_description[] = {
+  { XD_END }
+};
+
 DEFINE_LRECORD_IMPLEMENTATION ("uint16-byte-table", uint16_byte_table,
                                mark_uint16_byte_table,
 			       print_uint16_byte_table,
 			       0, uint16_byte_table_equal,
 			       uint16_byte_table_hash,
-			       0 /* uint16_byte_table_description */,
+			       uint16_byte_table_description,
 			       Lisp_Uint16_Byte_Table);
 
 static Lisp_Object
@@ -2836,41 +2844,20 @@ Return the alist of attributes of CHARACTER.
 */
        (character))
 {
+  struct gcpro gcpro1;
+  struct char_attribute_alist_closure char_attribute_alist_closure;
   Lisp_Object alist = Qnil;
-  int i;
 
   CHECK_CHAR (character);
-  {
-    struct gcpro gcpro1;
-    struct char_attribute_alist_closure char_attribute_alist_closure;
-  
-    GCPRO1 (alist);
-    char_attribute_alist_closure.char_id = XCHAR (character);
-    char_attribute_alist_closure.char_attribute_alist = &alist;
-    elisp_maphash (add_char_attribute_alist_mapper,
-		   Vchar_attribute_hash_table,
-		   &char_attribute_alist_closure);
-    UNGCPRO;
-  }
-
-  for (i = 0; i < countof (chlook->charset_by_leading_byte); i++)
-    {
-      Lisp_Object ccs = chlook->charset_by_leading_byte[i];
 
-      if (!NILP (ccs))
-	{
-	  Lisp_Object encoding_table = XCHARSET_ENCODING_TABLE (ccs);
-	  Lisp_Object cpos;
+  GCPRO1 (alist);
+  char_attribute_alist_closure.char_id = XCHAR (character);
+  char_attribute_alist_closure.char_attribute_alist = &alist;
+  elisp_maphash (add_char_attribute_alist_mapper,
+		 Vchar_attribute_hash_table,
+		 &char_attribute_alist_closure);
+  UNGCPRO;
 
-	  if ( CHAR_TABLEP (encoding_table)
-	       && INTP (cpos
-			= get_char_id_table (XCHAR_TABLE(encoding_table),
-					     XCHAR (character))) )
-	    {
-	      alist = Fcons (Fcons (ccs, cpos), alist);
-	    }
-	}
-    }
   return alist;
 }
 
@@ -2880,29 +2867,21 @@ Return DEFAULT-VALUE if the value is not exist.
 */
        (character, attribute, default_value))
 {
-  Lisp_Object ccs;
+  Lisp_Object table;
 
   CHECK_CHAR (character);
-  if (!NILP (ccs = Ffind_charset (attribute)))
-    {
-      Lisp_Object encoding_table = XCHARSET_ENCODING_TABLE (ccs);
 
-      if (CHAR_TABLEP (encoding_table))
-	return get_char_id_table (XCHAR_TABLE(encoding_table),
-				  XCHAR (character));
-    }
-  else
+  if (CHARSETP (attribute))
+    attribute = XCHARSET_NAME (attribute);
+
+  table = Fgethash (attribute, Vchar_attribute_hash_table,
+		    Qunbound);
+  if (!UNBOUNDP (table))
     {
-      Lisp_Object table = Fgethash (attribute,
-				    Vchar_attribute_hash_table,
-				    Qunbound);
-      if (!UNBOUNDP (table))
-	{
-	  Lisp_Object ret = get_char_id_table (XCHAR_TABLE(table),
-					       XCHAR (character));
-	  if (!UNBOUNDP (ret))
-	    return ret;
-	}
+      Lisp_Object ret = get_char_id_table (XCHAR_TABLE(table),
+					   XCHAR (character));
+      if (!UNBOUNDP (ret))
+	return ret;
     }
   return default_value;
 }
@@ -2912,13 +2891,12 @@ Store CHARACTER's ATTRIBUTE with VALUE.
 */
        (character, attribute, value))
 {
-  Lisp_Object ccs;
+  Lisp_Object ccs = Ffind_charset (attribute);
 
-  ccs = Ffind_charset (attribute);
   if (!NILP (ccs))
     {
       CHECK_CHAR (character);
-      return put_char_ccs_code_point (character, ccs, value);
+      value = put_char_ccs_code_point (character, ccs, value);
     }
   else if (EQ (attribute, Q_decomposition))
     {
@@ -3122,7 +3100,8 @@ Store character's ATTRIBUTES.
 	    signal_simple_error ("Invalid argument", attributes);
 	  if (!NILP (ccs = Ffind_charset (Fcar (cell)))
 	      && ((XCHARSET_FINAL (ccs) != 0) ||
-		  (XCHARSET_UCS_MAX (ccs) > 0)) )
+		  (XCHARSET_MAX_CODE (ccs) > 0) ||
+		  (EQ (ccs, Vcharset_chinese_big5))) )
 	    {
 	      cell = Fcdr (cell);
 	      if (CONSP (cell))
@@ -3349,7 +3328,7 @@ check_category_table (Lisp_Object object, Lisp_Object default_)
 
 int
 check_category_char (Emchar ch, Lisp_Object table,
-		     unsigned int designator, unsigned int not)
+		     unsigned int designator, unsigned int not_p)
 {
   REGISTER Lisp_Object temp;
   Lisp_Char_Table *ctbl;
@@ -3360,10 +3339,10 @@ check_category_char (Emchar ch, Lisp_Object table,
   ctbl = XCHAR_TABLE (table);
   temp = get_char_table (ch, ctbl);
   if (NILP (temp))
-    return not;
+    return not_p;
 
   designator -= ' ';
-  return bit_vector_bit (XBIT_VECTOR (temp), designator) ? !not : not;
+  return bit_vector_bit (XBIT_VECTOR (temp), designator) ? !not_p : not_p;
 }
 
 DEFUN ("check-category-at", Fcheck_category_at, 2, 4, 0, /*