From: tomo <tomo>
Date: Mon, 12 Apr 2004 05:35:14 +0000 (+0000)
Subject: (Vcharset_system_char_id): New variable in XEmacs CHISE.
X-Git-Tag: r21-4-14-chise-0_21-26^2~48
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=a7a864d01a905c7e5e3c60589c576e6373071090;p=chise%2Fxemacs-chise.git

(Vcharset_system_char_id): New variable in XEmacs CHISE.
(syms_of_mule_charset): Add new symbol `system-char-id' in XEmacs
CHISE.
(complex_vars_of_mule_charset): Add new coded-charset `system-char-id'
in XEmacs CHISE; modify `=ucs' to eliminate builtin characters over
0xEFFFF.
---

diff --git a/src/mule-charset.c b/src/mule-charset.c
index 9cb6015..6e7e49f 100644
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -1,7 +1,7 @@
 /* Functions to handle multilingual characters.
    Copyright (C) 1992, 1995 Free Software Foundation, Inc.
    Copyright (C) 1995 Sun Microsystems, Inc.
-   Copyright (C) 1999,2000,2001,2002,2003 MORIOKA Tomohiko
+   Copyright (C) 1999,2000,2001,2002,2003,2004 MORIOKA Tomohiko
 
 This file is part of XEmacs.
 
@@ -67,6 +67,7 @@ Lisp_Object Vcharset_japanese_jisx0212;
 Lisp_Object Vcharset_chinese_cns11643_1;
 Lisp_Object Vcharset_chinese_cns11643_2;
 #ifdef UTF2000
+Lisp_Object Vcharset_system_char_id;
 Lisp_Object Vcharset_ucs;
 Lisp_Object Vcharset_ucs_bmp;
 Lisp_Object Vcharset_ucs_smp;
@@ -2766,6 +2767,7 @@ syms_of_mule_charset (void)
   defsymbol (&Qmap_cns11643_1,		"=cns11643-1");
   defsymbol (&Qmap_cns11643_2,		"=cns11643-2");
 #ifdef UTF2000
+  defsymbol (&Qsystem_char_id,		"system-char-id");
   defsymbol (&Qmap_ucs,			"=ucs");
   defsymbol (&Qucs,			"ucs");
   defsymbol (&Qucs_bmp,			"ucs-bmp");
@@ -2851,6 +2853,15 @@ complex_vars_of_mule_charset (void)
      ease of access. */
 
 #ifdef UTF2000
+  staticpro (&Vcharset_system_char_id);
+  Vcharset_system_char_id =
+    make_charset (LEADING_BYTE_SYSTEM_CHAR_ID, Qsystem_char_id, 256, 4,
+		  1, 2, 0, CHARSET_LEFT_TO_RIGHT,
+		  build_string ("SCID"),
+		  build_string ("CHAR-ID"),
+		  build_string ("System char-id"),
+		  build_string (""),
+		  Qnil, 0, 0x7FFFFFFF, 0, 0, Qnil, CONVERSION_IDENTICAL);
   staticpro (&Vcharset_ucs);
   Vcharset_ucs =
     make_charset (LEADING_BYTE_UCS, Qmap_ucs, 256, 4,
@@ -2859,7 +2870,7 @@ complex_vars_of_mule_charset (void)
 		  build_string ("UCS"),
 		  build_string ("ISO/IEC 10646"),
 		  build_string (""),
-		  Qnil, 0, 0x7FFFFFFF, 0, 0, Qnil, CONVERSION_IDENTICAL);
+		  Qnil, 0, 0xEFFFF, 0, 0, Qnil, CONVERSION_IDENTICAL);
   staticpro (&Vcharset_ucs_bmp);
   Vcharset_ucs_bmp =
     make_charset (LEADING_BYTE_UCS_BMP, Qucs_bmp, 256, 2,