From: tomo <tomo>
Date: Sun, 9 May 2004 08:31:08 +0000 (+0000)
Subject: (Q_vulgar): Deleted.
X-Git-Tag: r21-4-14-chise-0_21-27^2~93
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=64a9494c90876fef46e9c71121dbe35ffa8ba16f;p=chise%2Fxemacs-chise.git

(Q_vulgar): Deleted.
(Q_vulgar_of): Deleted.
(Fput_char_attribute): Use Fstring_match to find `{<-|->}vulgar'.
(Fsave_char_attribute_table): Use `Fchar_refs_simplify_char_specs' for
`{<-|->}vulgar'.
(syms_of_chartab): Don't define `{<-|->}vulgar'.
---

diff --git a/src/chartab.c b/src/chartab.c
index b8984ea..c900f16 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -1146,8 +1146,6 @@ Lisp_Object Q_component;
 Lisp_Object Q_component_of;
 Lisp_Object Q_same;
 Lisp_Object Q_same_of;
-Lisp_Object Q_vulgar;
-Lisp_Object Q_vulgar_of;
 Lisp_Object Qto_ucs;
 Lisp_Object Q_ucs_unified;
 Lisp_Object Qcompat;
@@ -3518,11 +3516,10 @@ Store CHARACTER's ATTRIBUTE with VALUE.
 	    EQ (attribute, Q_component_of) ||
 	    EQ (attribute, Q_same) ||
 	    EQ (attribute, Q_same_of) ||
-	    EQ (attribute, Q_vulgar) ||
-	    EQ (attribute, Q_vulgar_of) ||
 	    !NILP (Fstring_match
-		   (build_string ("^<-\\(simplified"
-				  "\\|wrong\\)[^*]*$"),
+		   (build_string ("^\\(<-\\|->\\)\\(simplified"
+				  "\\|vulgar\\|wrong"
+				  "\\)[^*]*$"),
 		    Fsymbol_name (attribute),
 		    Qnil, Qnil)) )
     {
@@ -3552,23 +3549,28 @@ Store CHARACTER's ATTRIBUTE with VALUE.
 	rev_feature = Q_same_of;
       else if (EQ (attribute, Q_same_of))
 	rev_feature = Q_same;
-      else if (EQ (attribute, Q_vulgar))
-	rev_feature = Q_vulgar_of;
-      else if (EQ (attribute, Q_vulgar_of))
-	rev_feature = Q_vulgar;
       else
 	{
 	  Lisp_String* name = symbol_name (XSYMBOL (attribute));
 	  Bufbyte *name_str = string_data (name);
 
-	  if (name_str[0] == '<' && name_str[1] == '-')
+	  if ( (name_str[0] == '<' && name_str[1] == '-') || 
+	       (name_str[0] == '-' && name_str[1] == '>') )
 	    {
 	      Bytecount length = string_length (name);
 	      Bufbyte *rev_name_str = alloca (length + 1);
 
 	      memcpy (rev_name_str + 2, name_str + 2, length - 2);
-	      rev_name_str[0] = '-';
-	      rev_name_str[1] = '>';
+	      if (name_str[0] == '<')
+		{
+		  rev_name_str[0] = '-';
+		  rev_name_str[1] = '>';
+		}
+	      else
+		{
+		  rev_name_str[0] = '<';
+		  rev_name_str[1] = '-';
+		}
 	      rev_name_str[length] = 0;
 	      rev_feature = intern (rev_name_str);
 	    }
@@ -3843,8 +3845,9 @@ Save values of ATTRIBUTE into database file.
 	   || EQ (attribute, Q_same)
 	   || EQ (attribute, Q_same_of)
 	   || !NILP (Fstring_match
-		     (build_string ("^\\(<-\\|->\\)\\("
-				    "simplified\\|wrong\\)[^*]*$"),
+		     (build_string ("^\\(<-\\|->\\)\\(simplified"
+				    "\\|vulgar\\|wrong"
+				    "\\)[^*]*$"),
 		      Fsymbol_name (attribute),
 		      Qnil, Qnil)) )
 	filter = &Fchar_refs_simplify_char_specs;
@@ -4622,8 +4625,6 @@ syms_of_chartab (void)
   defsymbol (&Q_component_of,		"<-ideographic-component-forms");
   defsymbol (&Q_same,			"->same");
   defsymbol (&Q_same_of,		"<-same");
-  defsymbol (&Q_vulgar,			"->vulgar");
-  defsymbol (&Q_vulgar_of,		"<-vulgar");
   defsymbol (&Qcomposition,		"composition");
   defsymbol (&Q_decomposition,		"->decomposition");
   defsymbol (&Qcompat,			"compat");