(main_1): Call `structure_type_create_concord' when HAVE_CONCORD is

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

diff --git a/src/chartab.c b/src/chartab.c
index 67c7d92..b05f7d7 100644 (file)
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -3530,6 +3530,7 @@ Store CHARACTER's ATTRIBUTE with VALUE.
   else if ( EQ (attribute, Qmap_decomposition) ||
            EQ (attribute, Q_decomposition) )
     {
+      value = Fcopy_sequence (Fchar_refs_simplify_char_specs (value));
       attribute = put_char_composition (character, value);
       if ( !EQ (attribute, Qmap_decomposition) &&
           SYMBOLP (XCAR (value)) )
@@ -3567,17 +3568,13 @@ Store CHARACTER's ATTRIBUTE with VALUE.
        EQ (attribute, Q_circled_of)            ||
        EQ (attribute, Q_component)             ||
        EQ (attribute, Q_component_of)          ||
-       !NILP (Fstring_match
-             (build_string ("^\\(<-\\|->\\)\\("
-                            "canonical"
-                            "\\|halfwidth\\|superscript\\|subscript"
-                            "\\|circled\\|font\\|compat"
-                            "\\|fullwidth\\|halfwidth"
-                            "\\|simplified\\|vulgar\\|wrong"
-                            "\\|same\\|original\\|ancient"
-                            "\\|Oracle-Bones\\)[^*]*$"),
-              Fsymbol_name (attribute),
-              Qnil, Qnil)) )
+       ( !EQ (attribute, Q_ucs_unified)
+        && !NILP (Fstring_match
+                  (build_string ("^\\(<-\\|->\\)[^*]*$"),
+                   Fsymbol_name (attribute),
+                   Qnil, Qnil))
+        )
+       )
     {
       Lisp_Object rest = value;
       Lisp_Object ret;