From: tomo <tomo>
Date: Sun, 31 Jul 2005 12:21:08 +0000 (+0000)
Subject: (put_char_composition): Return `=>decomposition@FOO' for compatibility
X-Git-Tag: r21-4-17-chise-0_22-4^20~351
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f6bf48efef4188d859f2f6fb916ae592544825b;p=chise%2Fxemacs-chise.git

(put_char_composition): Return `=>decomposition@FOO' for compatibility
decomposition mapping tagged FOO.
(Fput_char_attribute): Modify for `put_char_composition'.
---

diff --git a/src/chartab.c b/src/chartab.c
index f68ccba..94dcb88 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -3433,6 +3433,12 @@ put_char_composition (Lisp_Object character, Lisp_Object value)
 	}
       else if (EQ (XCAR (value), Qcompat))
 	return Qto_decomposition_at_compat;
+      else
+	return
+	  Fintern
+	  (concat2 (build_string ("=>decomposition@"),
+		    symbol_name (XSYMBOL (XCAR (value)))),
+	   Qnil);
     }
   else
     {
@@ -3501,8 +3507,12 @@ Store CHARACTER's ATTRIBUTE with VALUE.
 	    EQ (attribute, Q_decomposition) )
     {
       attribute = put_char_composition (character, value);
-      if ( EQ (attribute, Q_compat_of) ||
-	   EQ (attribute, Qto_decomposition_at_compat) )
+      if ( /*
+	     EQ (attribute, Q_compat_of) ||
+	     EQ (attribute, Qto_decomposition_at_compat)
+	   */
+	  /* SYMBOLP (XCAR (value)) */
+	  !EQ (attribute, Qmap_decomposition) )
 	value = XCDR (value);
     }
   else if (EQ (attribute, Qto_ucs))