projects
/
chise
/
xemacs-chise.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sync up with r21-2-19-tomo-6.
[chise/xemacs-chise.git]
/
src
/
mule-charset.c
diff --git
a/src/mule-charset.c
b/src/mule-charset.c
index
1929996
..
7959a90
100644
(file)
--- a/
src/mule-charset.c
+++ b/
src/mule-charset.c
@@
-75,7
+75,7
@@
static int composite_char_col_next;
#endif /* ENABLE_COMPOSITE_CHARS */
/* Table of charsets indexed by leading byte. */
#endif /* ENABLE_COMPOSITE_CHARS */
/* Table of charsets indexed by leading byte. */
-Lisp_Object charset_by_leading_byte[128];
+Lisp_Object charset_by_leading_byte[NUM_LEADING_BYTES];
/* Table of charsets indexed by type/final-byte/direction. */
Lisp_Object charset_by_attributes[4][128][2];
/* Table of charsets indexed by type/final-byte/direction. */
Lisp_Object charset_by_attributes[4][128][2];
@@
-605,8
+605,8
@@
make_charset (int id, Lisp_Object name, unsigned char rep_bytes,
charset_by_attributes[type][final][direction] = obj;
}
charset_by_attributes[type][final][direction] = obj;
}
- assert (NILP (charset_by_leading_byte[id - 128]));
- charset_by_leading_byte[id - 128] = obj;
+ assert (NILP (charset_by_leading_byte[id - MIN_LEADING_BYTE]));
+ charset_by_leading_byte[id - MIN_LEADING_BYTE] = obj;
#ifndef UTF2000
if (id < 0xA0)
/* official leading byte */
#ifndef UTF2000
if (id < 0xA0)
/* official leading byte */
@@
-1404,17
+1404,11
@@
syms_of_mule_charset (void)
defsymbol (&Qcomposite, "composite");
#ifdef UTF2000
defsymbol (&Qcomposite, "composite");
#ifdef UTF2000
- Vutf_2000_version = build_string("0.3 (Imamiya)");
+ Vutf_2000_version = build_string("0.4 (Shin-Imamiya)");
DEFVAR_LISP ("utf-2000-version", &Vutf_2000_version /*
Version number of UTF-2000.
*/ );
#endif
DEFVAR_LISP ("utf-2000-version", &Vutf_2000_version /*
Version number of UTF-2000.
*/ );
#endif
-
- leading_code_private_11 = PRE_LEADING_BYTE_PRIVATE_1;
- DEFVAR_INT ("leading-code-private-11", &leading_code_private_11 /*
-Leading-code of private TYPE9N charset of column-width 1.
-*/ );
- leading_code_private_11 = PRE_LEADING_BYTE_PRIVATE_1;
}
void
}
void
@@
-1434,6
+1428,12
@@
vars_of_mule_charset (void)
next_allocated_1_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_1;
next_allocated_2_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_2;
next_allocated_1_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_1;
next_allocated_2_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_2;
+
+ leading_code_private_11 = PRE_LEADING_BYTE_PRIVATE_1;
+ DEFVAR_INT ("leading-code-private-11", &leading_code_private_11 /*
+Leading-code of private TYPE9N charset of column-width 1.
+*/ );
+ leading_code_private_11 = PRE_LEADING_BYTE_PRIVATE_1;
}
void
}
void