From: tomo <tomo>
Date: Sun, 24 Jul 2005 23:44:04 +0000 (+0000)
Subject: (Qmap_decomposition): New variable.
X-Git-Tag: r21-4-17-chise-0_22-4^20~377
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=6904fbf5fc782f4a2b47a03e4318be17a5faa2b8;p=chise%2Fxemacs-chise.git-

(Qmap_decomposition): New variable.
(Fput_char_attribute): Convert `->decomposition' to `=decomposition'.
(syms_of_chartab): Add new symbol `=decomposition'.
---

diff --git a/src/chartab.c b/src/chartab.c
index 425e2ba..532c71f 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -4,7 +4,7 @@
    Copyright (C) 1995, 1996 Ben Wing.
    Copyright (C) 1995, 1997, 1999 Electrotechnical Laboratory, JAPAN.
    Licensed to the Free Software Foundation.
-   Copyright (C) 1999,2000,2001,2002,2003,2004 MORIOKA Tomohiko
+   Copyright (C) 1999,2000,2001,2002,2003,2004,2005 MORIOKA Tomohiko
 
 This file is part of XEmacs.
 
@@ -1130,6 +1130,7 @@ make_char_id_table (Lisp_Object initval)
 
 
 Lisp_Object Qcomposition;
+Lisp_Object Qmap_decomposition;
 Lisp_Object Q_decomposition;
 Lisp_Object Q_identical;
 Lisp_Object Q_identical_from;
@@ -3484,8 +3485,13 @@ Store CHARACTER's ATTRIBUTE with VALUE.
       value = put_char_ccs_code_point (character, ccs, value);
       attribute = XCHARSET_NAME (ccs);
     }
-  else if (EQ (attribute, Q_decomposition))
+  else if (EQ (attribute, Qmap_decomposition))
     put_char_composition (character, value);
+  else if (EQ (attribute, Q_decomposition))
+    {
+      attribute = Qmap_decomposition;
+      put_char_composition (character, value);
+    }
   else if (EQ (attribute, Qto_ucs))
     {
       Lisp_Object ret;
@@ -4630,6 +4636,7 @@ syms_of_chartab (void)
   defsymbol (&Q_component,		"->ideographic-component-forms");
   defsymbol (&Q_component_of,		"<-ideographic-component-forms");
   defsymbol (&Qcomposition,		"composition");
+  defsymbol (&Qmap_decomposition,	"=decomposition");
   defsymbol (&Q_decomposition,		"->decomposition");
   defsymbol (&Qcompat,			"compat");
   defsymbol (&Qisolated,		"isolated");