From: tomo <tomo>
Date: Thu, 12 Jul 2001 07:59:32 +0000 (+0000)
Subject: (Fdecode_builtin_char): Use `latin-viscii-lower' and
X-Git-Tag: r21-2-38-utf-2000-0_17-1~350
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=5968a03c7df1a0b9335051a40e0527f43a782440;p=chise%2Fxemacs-chise.git-

(Fdecode_builtin_char): Use `latin-viscii-lower' and
`latin-viscii-upper' for `latin-viscii'.
---

diff --git a/src/mule-charset.c b/src/mule-charset.c
index 5b00fec..84a9de9 100644
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -3164,6 +3164,31 @@ Make a builtin character from CHARSET and code-point CODE.
 
   charset = Fget_charset (charset);
   CHECK_INT (code);
+  if (EQ (charset, Vcharset_latin_viscii))
+    {
+      Lisp_Object chr = Fdecode_char (charset, code);
+      Lisp_Object ret;
+
+      if (!NILP (chr))
+	{
+	  if (!NILP
+	      (ret = Fget_char_attribute (chr,
+					  Vcharset_latin_viscii_lower,
+					  Qnil)))
+	    {
+	      charset = Vcharset_latin_viscii_lower;
+	      code = ret;
+	    }
+	  else if (!NILP
+		   (ret = Fget_char_attribute (chr,
+					       Vcharset_latin_viscii_upper,
+					       Qnil)))
+	    {
+	      charset = Vcharset_latin_viscii_upper;
+	      code = ret;
+	    }
+	}
+    }
   c = XINT (code);
 #if 0
   if (XCHARSET_GRAPHIC (charset) == 1)