From 754c86ead75bb8653a724036a6ff89954dfd2f10 Mon Sep 17 00:00:00 2001 From: tomo Date: Tue, 4 Mar 2003 03:18:19 +0000 Subject: [PATCH] Sync up with r21-4-10-utf-2000-0_20-ucs-jis-l. --- lisp/ChangeLog | 5 +++++ lisp/mule/mule-conf.el | 9 +++++++++ src/ChangeLog | 9 +++++++++ src/char-ucs.h | 3 --- src/mule-charset.c | 13 ------------- 5 files changed, 23 insertions(+), 16 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 64aa38b..722d820 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2003-03-03 MORIOKA Tomohiko + + * mule/mule-conf.el (ucs-jis): New coded-charsets when `utf-2000' + is provided [was builtin coded-charsets]. + 2003-03-02 MORIOKA Tomohiko * mule/mule-conf.el (ucs-ks): New coded-charsets when `utf-2000' diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el index 7c7f64d..339e89e 100644 --- a/lisp/mule/mule-conf.el +++ b/lisp/mule/mule-conf.el @@ -139,6 +139,15 @@ ) (when (featurep 'utf-2000) + (make-charset 'ucs-jis + "UCS for JIS" + `(long-name "ISO/IEC 10646 for JIS X0208/0212/0213" + chars 256 + dimension 3 + columns 2 + graphic 2 + direction l2r + mother ucs)) (make-charset '=ucs-jis-1990 "UCS for JIS:1990" `(long-name "ISO/IEC 10646 for JIS X 0208/0212:1990" diff --git a/src/ChangeLog b/src/ChangeLog index 90200b8..5eaf834 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2003-03-03 MORIOKA Tomohiko + + * char-ucs.h (LEADING_BYTE_UCS_JIS): Deleted. + + * mule-charset.c (Vcharset_ucs_jis): Deleted. + (Qucs_jis): Deleted. + (syms_of_mule_charset): Delete `ucs-jis'. + (complex_vars_of_mule_charset): Likewise. + 2003-03-02 MORIOKA Tomohiko * char-ucs.h (LEADING_BYTE_UCS_KS): Deleted. diff --git a/src/char-ucs.h b/src/char-ucs.h index 658888c..f8db601 100644 --- a/src/char-ucs.h +++ b/src/char-ucs.h @@ -82,9 +82,6 @@ typedef short Charset_ID; /* ISO/IEC 10646 for CNS */ #define LEADING_BYTE_UCS_CNS (MIN_LEADING_BYTE + 7) -/* ISO/IEC 10646 for JIS */ -#define LEADING_BYTE_UCS_JIS (MIN_LEADING_BYTE + 8) - /* Japanese JIS X0208 Common 2/4 2/{(8),9,10,11} 4/2 (B) */ #define LEADING_BYTE_JIS_X0208 (MIN_LEADING_BYTE + 11) diff --git a/src/mule-charset.c b/src/mule-charset.c index 11f6d76..7c6aa60 100644 --- a/src/mule-charset.c +++ b/src/mule-charset.c @@ -70,7 +70,6 @@ Lisp_Object Vcharset_ucs_smp; Lisp_Object Vcharset_ucs_sip; Lisp_Object Vcharset_ucs_gb; Lisp_Object Vcharset_ucs_cns; -Lisp_Object Vcharset_ucs_jis; Lisp_Object Vcharset_latin_viscii; Lisp_Object Vcharset_latin_tcvn5712; Lisp_Object Vcharset_latin_viscii_lower; @@ -312,7 +311,6 @@ Lisp_Object Qascii, Qucs_sip, Qucs_gb, Qucs_cns, - Qucs_jis, Qlatin_viscii, Qlatin_tcvn5712, Qlatin_viscii_lower, @@ -2383,7 +2381,6 @@ syms_of_mule_charset (void) defsymbol (&Qucs_sip, "ucs-sip"); defsymbol (&Qucs_gb, "ucs-gb"); defsymbol (&Qucs_cns, "ucs-cns"); - defsymbol (&Qucs_jis, "ucs-jis"); defsymbol (&Qlatin_viscii, "latin-viscii"); defsymbol (&Qlatin_tcvn5712, "latin-tcvn5712"); defsymbol (&Qlatin_viscii_lower, "latin-viscii-lower"); @@ -2520,16 +2517,6 @@ complex_vars_of_mule_charset (void) build_string ("ISO/IEC 10646 for CNS 11643"), build_string (""), Qnil, 0, 0, 0, 0, Vcharset_ucs, CONVERSION_IDENTICAL); - staticpro (&Vcharset_ucs_jis); - Vcharset_ucs_jis = - make_charset (LEADING_BYTE_UCS_JIS, Qucs_jis, 256, 3, - 2, 2, 0, CHARSET_LEFT_TO_RIGHT, - build_string ("UCS for JIS"), - build_string ("UCS for JIS X 0208, 0212 and 0213"), - build_string - ("ISO/IEC 10646 for JIS X 0208, 0212 and 0213"), - build_string (""), - Qnil, 0, 0, 0, 0, Vcharset_ucs, CONVERSION_IDENTICAL); #else # define MIN_CHAR_THAI 0 # define MAX_CHAR_THAI 0 -- 1.7.10.4