From: tomo <tomo>
Date: Tue, 20 Nov 2001 08:48:52 +0000 (+0000)
Subject: Include "elhash.h".
X-Git-Tag: no-et-1~7
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=ea86399ccb845a1fe753c55497c1e4e0d3d4f60d;p=chise%2Fxemacs-chise.git

Include "elhash.h".
(Vchar_attribute_hash_table): New external variable.
(struct Lisp_Charset): Delete `encoding_table'.
(CHARSET_ENCODING_TABLE): New implementation; refer
`Vchar_attribute_hash_table' instead of `encoding_table' of struct
`Lisp_Charset'.
---

diff --git a/src/char-ucs.h b/src/char-ucs.h
index 98696da..d8768c6 100644
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -22,6 +22,9 @@ Boston, MA 02111-1307, USA.  */
 #define INCLUDED_char_ucs_h_
 
 #include "chartab.h"
+#include "elhash.h"
+
+extern Lisp_Object Vchar_attribute_hash_table;
 
 #define valid_char_p(ch) 1
 
@@ -293,9 +296,6 @@ struct Lisp_Charset
   /* Code-point->character mapping table */
   Lisp_Object decoding_table;
 
-  /* Character->code-point mapping table */
-  Lisp_Object encoding_table;
-
   /* Range of character code */
   Emchar ucs_min, ucs_max;
 
@@ -335,12 +335,19 @@ DECLARE_LRECORD (charset, Lisp_Charset);
 #define CHARSET_CHARS(cs)	 ((cs)->chars)
 #define CHARSET_REVERSE_DIRECTION_CHARSET(cs) ((cs)->reverse_direction_charset)
 #define CHARSET_DECODING_TABLE(cs) ((cs)->decoding_table)
-#define CHARSET_ENCODING_TABLE(cs) ((cs)->encoding_table)
 #define CHARSET_UCS_MIN(cs)	 ((cs)->ucs_min)
 #define CHARSET_UCS_MAX(cs)	 ((cs)->ucs_max)
 #define CHARSET_CODE_OFFSET(cs)	 ((cs)->code_offset)
 #define CHARSET_BYTE_OFFSET(cs)	 ((cs)->byte_offset)
 
+INLINE_HEADER Lisp_Object CHARSET_ENCODING_TABLE (Lisp_Charset* cs);
+INLINE_HEADER Lisp_Object
+CHARSET_ENCODING_TABLE (Lisp_Charset* cs)
+{
+  return Fgethash (CHARSET_NAME(cs),
+		   Vchar_attribute_hash_table,
+		   Qnil);
+}
 
 #define XCHARSET_ID(cs)		  CHARSET_ID           (XCHARSET (cs))
 #define XCHARSET_NAME(cs)	  CHARSET_NAME         (XCHARSET (cs))