(U+4E29): Use `->subsumptive'.

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

diff --git a/src/chartab.c b/src/chartab.c
index 81d2105..7746288 100644 (file)
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -1130,10 +1130,6 @@ make_char_id_table (Lisp_Object initval)
 }
 
 
-#if defined(HAVE_CHISE) && !defined(HAVE_LIBCHISE_LIBCHISE)
-Lisp_Object Qsystem_char_id;
-#endif
-
 Lisp_Object Qcomposition;
 Lisp_Object Q_decomposition;
 Lisp_Object Q_identical;
@@ -3515,6 +3511,7 @@ Store CHARACTER's ATTRIBUTE with VALUE.
            !NILP (Fstring_match
                   (build_string ("^\\(<-\\|->\\)\\(simplified"
                                  "\\|same\\|vulgar\\|wrong"
+                                 "\\|original"
                                  "\\)[^*]*$"),
                    Fsymbol_name (attribute),
                    Qnil, Qnil)) )
@@ -3583,8 +3580,9 @@ Store CHARACTER's ATTRIBUTE with VALUE.
              if (!CONSP (ffv))
                put_char_attribute (ret, rev_feature, list1 (character));
              else if (NILP (Fmemq (character, ffv)))
-               put_char_attribute (ret, rev_feature,
-                                   Fcons (character, ffv));
+               put_char_attribute
+                 (ret, rev_feature,
+                  nconc2 (Fcopy_sequence (ffv), list1 (character)));
              Fsetcar (rest, ret);
            }
          rest = XCDR (rest);
@@ -3837,6 +3835,7 @@ Save values of ATTRIBUTE into database file.
           || !NILP (Fstring_match
                     (build_string ("^\\(<-\\|->\\)\\(simplified"
                                    "\\|same\\|vulgar\\|wrong"
+                                   "\\|original"
                                    "\\)[^*]*$"),
                      Fsymbol_name (attribute),
                      Qnil, Qnil)) )