X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=src%2Fchartab.c;h=7c1408ae227f3718f1b14b411614f0334e946b83;hp=ea4860fe3c9b586325cf6c5cfa744d386e2a7c28;hb=0a57cba46779af884cc537d18923dcb6313b9904;hpb=75e5181a9626c8bbbe57c1b8c6a6a04ec2b9597c

diff --git a/src/chartab.c b/src/chartab.c
index ea4860f..7c1408ae 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -5,7 +5,7 @@
    Copyright (C) 1995, 1997, 1999 Electrotechnical Laboratory, JAPAN.
    Licensed to the Free Software Foundation.
    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008,
-     2010, 2011, 2012, 2013 MORIOKA Tomohiko
+     2010, 2011, 2012, 2013, 2015, 2016 MORIOKA Tomohiko
 
 This file is part of XEmacs.
 
@@ -3413,6 +3413,7 @@ Return DEFAULT-VALUE if the value is not exist.
   if (!UNBOUNDP (ret))
     return ret;
 
+#if 0
   if (NILP (feature_rel_max)
       || (INTP (feature_rel_max) &&
 	  XINT (feature_rel_max) > 0))
@@ -3437,6 +3438,7 @@ Return DEFAULT-VALUE if the value is not exist.
 	    return ret;
 	}
     }
+#endif
 
   if ( !(EQ (attribute, Q_identical)) &&
        !(EQ (attribute, Q_subsumptive_from)) &&
@@ -3445,11 +3447,13 @@ Return DEFAULT-VALUE if the value is not exist.
 	  || (INTP (char_rel_max) &&
 	      XINT (char_rel_max) > 0)) ) )
     {
+#if 0
       Lisp_String* name = symbol_name (XSYMBOL (attribute));
       Bufbyte *name_str = string_data (name);
 
       if ( (name_str[0] != '=') || (name_str[1] == '>') )
 	{
+#endif
 	  ret = find_char_feature_in_family (character, Q_identical,
 					     attribute, feature_rel_max);
 	  if (!UNBOUNDP (ret))
@@ -3464,7 +3468,9 @@ Return DEFAULT-VALUE if the value is not exist.
 					     attribute, feature_rel_max);
 	  if (!UNBOUNDP (ret))
 	    return ret;
+#if 0
 	}
+#endif
     }
   return default_value;
 }
@@ -3932,12 +3938,12 @@ char_table_get_db (Lisp_Char_Table* cit, Emchar ch)
   return val;
 }
 
-#ifdef HAVE_LIBCHISE
+#ifdef USE_CONCORD_OBJECT_SYSTEM
 COS_object
 char_table_get_db_cos (Lisp_Char_Table* cit, Emchar ch)
 {
   return
-    concord_object_get_feature_value
+    concord_object_get_attribute
     (cos_make_char (ch),
      cos_intern (XSTRING_DATA (Fsymbol_name (cit->name))));
 }
@@ -4213,7 +4219,7 @@ load_char_attribute_maybe (Lisp_Char_Table* cit, Emchar ch)
   return Qunbound;
 }
 
-#ifdef HAVE_LIBCHISE
+#ifdef USE_CONCORD_OBJECT_SYSTEM
 COS_object
 load_char_attribute_maybe_cos (Lisp_Char_Table* cit, Emchar ch)
 {
@@ -4224,13 +4230,13 @@ load_char_attribute_maybe_cos (Lisp_Char_Table* cit, Emchar ch)
       COS_object val;
 
       if (char_table_open_db_maybe (cit))
-	return Qunbound;
+	return NULL;
 
       val = char_table_get_db_cos (cit, ch);
 
       return val;
     }
-  return Qunbound;
+  return NULL;
 }
 #endif