From add87c268390e830359bae905342efc0e71bc4fa Mon Sep 17 00:00:00 2001 From: tomo Date: Tue, 14 Sep 1999 15:52:47 +0000 Subject: [PATCH] (MAKE_CHAR): Fix problem in 2-dimension charset. --- src/char-ucs.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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) { -- 1.7.10.4