X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fchar-ucs.h;h=ef96fbf14f2cf6fbe334d10ecb0f218ac0cfd938;hb=080c0efe6b66807a86870eed7c13b8c4c1d563cc;hp=ba1e919fb2bd7e374451dd7802fa3545cde06d5c;hpb=892bf1ee89cb04fb3091f9b3cfe0d86fbb4ba20b;p=chise%2Fxemacs-chise.git

diff --git a/src/char-ucs.h b/src/char-ucs.h
index ba1e919..ef96fbf 100644
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -64,8 +64,8 @@ extern Lisp_Object Vcharset_latin_viscii_upper;
 
 typedef int Charset_ID;
 
-#define MIN_LEADING_BYTE		0x00
-#define CHARSET_ID_OFFSET		0x40
+#define MIN_LEADING_BYTE		-0x40
+#define CHARSET_ID_OFFSET		0x00
 
 /* represent normal 80-9F */
 #define LEADING_BYTE_CONTROL_1		(CHARSET_ID_OFFSET - 1)
@@ -189,7 +189,7 @@ typedef int Charset_ID;
 #define LEADING_BYTE_KOREAN_KPS9566	('N' + CHARSET_ID_OFFSET_94x94)
 
 
-#define NUM_LEADING_BYTES 256
+#define NUM_LEADING_BYTES	(80 * 3 - MIN_LEADING_BYTE)
 
 
 /************************************************************************/
@@ -268,7 +268,7 @@ DECLARE_LRECORD (charset, struct Lisp_Charset);
 
 /* Leading byte and id have been regrouped. -- OG */
 #define CHARSET_ID(cs)		 ((cs)->id)
-#define CHARSET_LEADING_BYTE(cs) ((Bufbyte)(CHARSET_ID(cs)))
+#define CHARSET_LEADING_BYTE(cs) (CHARSET_ID(cs))
 #define CHARSET_NAME(cs)	 ((cs)->name)
 #define CHARSET_SHORT_NAME(cs)	 ((cs)->short_name)
 #define CHARSET_LONG_NAME(cs)	 ((cs)->long_name)
@@ -612,8 +612,7 @@ CHAR_CHARSET (Emchar ch)
   return charset;
 }
 
-#define CHAR_LEADING_BYTE(c) (XCHARSET_LEADING_BYTE(CHAR_CHARSET(c)))
-
+#define CHAR_CHARSET_ID(c)  (XCHARSET_ID(CHAR_CHARSET(c)))
 #define CHAR_COLUMNS(c)     (CHARSET_COLUMNS(XCHARSET(CHAR_CHARSET(c))))