From: MORIOKA Tomohiko <tomo.git@chise.org>
Date: Sun, 19 May 2013 08:24:27 +0000 (+0900)
Subject: (get_char_id_table_ce): Use `load_char_attribute_maybe_cos' instead of
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=8fc2a406e3882d202cce1f1e96adf4d1d7e5d5fa;p=chise%2Fxemacs-chise.git

(get_char_id_table_ce): Use `load_char_attribute_maybe_cos' instead of
`load_char_attribute_maybe'.
---

diff --git a/src/chartab.h b/src/chartab.h
index 5800283..9bda386 100644
--- a/src/chartab.h
+++ b/src/chartab.h
@@ -431,38 +431,24 @@ get_char_id_table_ce (Lisp_Char_Table* cit, Emchar ch);
 INLINE_HEADER Lisp_Object
 get_char_id_table_ce (Lisp_Char_Table* cit, Emchar ch)
 {
-#if 1
   Lisp_Object val = get_char_id_table_0 (cit, ch);
 
   if (EQ (val, Qunloaded))
     {
+#if 0
       val = load_char_attribute_maybe (cit, ch);
-      /* put_char_id_table_0 (cit, ch, val); */
-    }
-  if (UNBOUNDP (val))
-    return cit->default_value;
-  else
-    return val;
 #else
-  Lisp_Object val = get_char_id_table_0 (cit, ch);
-
-  if (EQ (val, Qunloaded))
-    {
-#if 0
-      val = load_char_attribute_maybe_cos (cit, ch);
-      if ( val == NULL )
+      COS_object ret = load_char_attribute_maybe_cos (cit, ch);
+      if ( ret == NULL )
 	return cit->default_value;
       else
-	return val;
-#else
-      val = load_char_attribute_maybe (cit, ch);
+	return ret;
 #endif
     }
-  if ( UNBOUNDP (val) )
+  if (UNBOUNDP (val))
     return cit->default_value;
   else
     return val;
-#endif
 }
 #else
 #define get_char_id_table_ce(cit, ch) get_char_id_table(cit, ch)