From: tomo <tomo>
Date: Tue, 14 Sep 1999 15:52:47 +0000 (+0000)
Subject: (MAKE_CHAR): Fix problem in 2-dimension charset.
X-Git-Tag: r21-2-19-utf-2000-0_8-0~3
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=add87c268390e830359bae905342efc0e71bc4fa;p=chise%2Fxemacs-chise.git.1

(MAKE_CHAR): Fix problem in 2-dimension charset.
---

diff --git a/src/char-ucs.h b/src/char-ucs.h
index 56b72bf..7302124 100644
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -372,7 +372,13 @@ MAKE_CHAR (Lisp_Object charset, int c1, int c2)
       /* return MIN_CHAR_94 + ('I' - '0') * 94 + (c1 - 33); */
       return ' ';
   else if (CHARSET_UCS_MAX (XCHARSET (charset)))
-    return c1 - CHARSET_CODE_OFFSET (XCHARSET (charset))
+    return (XCHARSET_DIMENSION (charset) == 1
+	    ?
+	    c1 - CHARSET_CODE_OFFSET (XCHARSET (charset))
+	    :
+	    (c1 - CHARSET_CODE_OFFSET (XCHARSET (charset)))
+	    * XCHARSET_CHARS (charset)
+	    + c2  - CHARSET_CODE_OFFSET (XCHARSET (charset)))
       + CHARSET_UCS_MIN (XCHARSET (charset));
   else if (XCHARSET_DIMENSION (charset) == 1)
     {