From cf5826ba66a06da2de9b9a3cc029d811a0887e51 Mon Sep 17 00:00:00 2001 From: tomo Date: Fri, 28 Jan 2000 02:26:11 +0000 Subject: [PATCH] (decode_char_table_range): Use `XCHARSET_CHARS' and `XCHARSET_DIMENSION' instead of `XCHARSET_TYPE'. --- src/chartab.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/chartab.c b/src/chartab.c index 0096b43..79e91d6 100644 --- a/src/chartab.c +++ b/src/chartab.c @@ -744,21 +744,23 @@ decode_char_table_range (Lisp_Object range, struct chartab_range *outrange) outrange->charset = Fget_charset (elts[0]); CHECK_INT (elts[1]); outrange->row = XINT (elts[1]); - switch (XCHARSET_TYPE (outrange->charset)) + if (XCHARSET_DIMENSION (outrange->charset) >= 2) { - case CHARSET_TYPE_94: - case CHARSET_TYPE_96: - signal_simple_error ("Charset in row vector must be multi-byte", - outrange->charset); - case CHARSET_TYPE_94X94: - check_int_range (outrange->row, 33, 126); - break; - case CHARSET_TYPE_96X96: - check_int_range (outrange->row, 32, 127); - break; - default: - abort (); + switch (XCHARSET_CHARS (outrange->charset)) + { + case 94: + check_int_range (outrange->row, 33, 126); + break; + case 96: + check_int_range (outrange->row, 32, 127); + break; + default: + abort (); + } } + else + signal_simple_error ("Charset in row vector must be multi-byte", + outrange->charset); } else { -- 1.7.10.4