projects
/
chise
/
xemacs-chise.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge r21-2-41-syntax-1.
[chise/xemacs-chise.git]
/
src
/
text-coding.c
diff --git
a/src/text-coding.c
b/src/text-coding.c
index
0618539
..
35e8523
100644
(file)
--- a/
src/text-coding.c
+++ b/
src/text-coding.c
@@
-47,17
+47,17
@@
Lisp_Object Vcoding_system_for_write;
Lisp_Object Vfile_name_coding_system;
/* Table of symbols identifying each coding category. */
Lisp_Object Vfile_name_coding_system;
/* Table of symbols identifying each coding category. */
-Lisp_Object coding_category_symbol[CODING_CATEGORY_LAST + 1];
+Lisp_Object coding_category_symbol[CODING_CATEGORY_LAST];
struct file_coding_dump {
/* Coding system currently associated with each coding category. */
struct file_coding_dump {
/* Coding system currently associated with each coding category. */
- Lisp_Object coding_category_system[CODING_CATEGORY_LAST + 1];
+ Lisp_Object coding_category_system[CODING_CATEGORY_LAST];
/* Table of all coding categories in decreasing order of priority.
This describes a permutation of the possible coding categories. */
/* Table of all coding categories in decreasing order of priority.
This describes a permutation of the possible coding categories. */
- int coding_category_by_priority[CODING_CATEGORY_LAST + 1];
+ int coding_category_by_priority[CODING_CATEGORY_LAST];
#if defined(MULE) && !defined(UTF2000)
Lisp_Object ucs_to_mule_table[65536];
#if defined(MULE) && !defined(UTF2000)
Lisp_Object ucs_to_mule_table[65536];
@@
-1467,7
+1467,7
@@
decode_coding_category (Lisp_Object symbol)
int i;
CHECK_SYMBOL (symbol);
int i;
CHECK_SYMBOL (symbol);
- for (i = 0; i <= CODING_CATEGORY_LAST; i++)
+ for (i = 0; i < CODING_CATEGORY_LAST; i++)
if (EQ (coding_category_symbol[i], symbol))
return i;
if (EQ (coding_category_symbol[i], symbol))
return i;
@@
-1483,7
+1483,7
@@
Return a list of all recognized coding categories.
int i;
Lisp_Object list = Qnil;
int i;
Lisp_Object list = Qnil;
- for (i = CODING_CATEGORY_LAST; i >= 0; i--)
+ for (i = CODING_CATEGORY_LAST - 1; i >= 0; i--)
list = Fcons (coding_category_symbol[i], list);
return list;
}
list = Fcons (coding_category_symbol[i], list);
return list;
}
@@
-1497,13
+1497,13
@@
previously.
*/
(list))
{
*/
(list))
{
- int category_to_priority[CODING_CATEGORY_LAST + 1];
+ int category_to_priority[CODING_CATEGORY_LAST];
int i, j;
Lisp_Object rest;
/* First generate a list that maps coding categories to priorities. */
int i, j;
Lisp_Object rest;
/* First generate a list that maps coding categories to priorities. */
- for (i = 0; i <= CODING_CATEGORY_LAST; i++)
+ for (i = 0; i < CODING_CATEGORY_LAST; i++)
category_to_priority[i] = -1;
/* Highest priority comes from the specified list. */
category_to_priority[i] = -1;
/* Highest priority comes from the specified list. */
@@
-1520,7
+1520,7
@@
previously.
/* Now go through the existing categories by priority to retrieve
the categories not yet specified and preserve their priority
order. */
/* Now go through the existing categories by priority to retrieve
the categories not yet specified and preserve their priority
order. */
- for (j = 0; j <= CODING_CATEGORY_LAST; j++)
+ for (j = 0; j < CODING_CATEGORY_LAST; j++)
{
int cat = fcd->coding_category_by_priority[j];
if (category_to_priority[cat] < 0)
{
int cat = fcd->coding_category_by_priority[j];
if (category_to_priority[cat] < 0)
@@
-1530,7
+1530,7
@@
previously.
/* Now we need to construct the inverse of the mapping we just
constructed. */
/* Now we need to construct the inverse of the mapping we just
constructed. */
- for (i = 0; i <= CODING_CATEGORY_LAST; i++)
+ for (i = 0; i < CODING_CATEGORY_LAST; i++)
fcd->coding_category_by_priority[category_to_priority[i]] = i;
/* Phew! That was confusing. */
fcd->coding_category_by_priority[category_to_priority[i]] = i;
/* Phew! That was confusing. */
@@
-1545,7
+1545,7
@@
Return a list of coding categories in descending order of priority.
int i;
Lisp_Object list = Qnil;
int i;
Lisp_Object list = Qnil;
- for (i = CODING_CATEGORY_LAST; i >= 0; i--)
+ for (i = CODING_CATEGORY_LAST - 1; i >= 0; i--)
list = Fcons (coding_category_symbol[fcd->coding_category_by_priority[i]],
list);
return list;
list = Fcons (coding_category_symbol[fcd->coding_category_by_priority[i]],
list);
return list;
@@
-1795,7
+1795,7
@@
coding_system_from_mask (int mask)
#endif
/* Look through the coding categories by priority and find
the first one that is allowed. */
#endif
/* Look through the coding categories by priority and find
the first one that is allowed. */
- for (i = 0; i <= CODING_CATEGORY_LAST; i++)
+ for (i = 0; i < CODING_CATEGORY_LAST; i++)
{
cat = fcd->coding_category_by_priority[i];
if ((mask & (1 << cat)) &&
{
cat = fcd->coding_category_by_priority[i];
if ((mask & (1 << cat)) &&
@@
-1993,7
+1993,7
@@
type. Optional arg BUFFER defaults to the current buffer.
#ifdef MULE
decst.mask = postprocess_iso2022_mask (decst.mask);
#endif
#ifdef MULE
decst.mask = postprocess_iso2022_mask (decst.mask);
#endif
- for (i = CODING_CATEGORY_LAST; i >= 0; i--)
+ for (i = CODING_CATEGORY_LAST - 1; i >= 0; i--)
{
int sys = fcd->coding_category_by_priority[i];
if (decst.mask & (1 << sys))
{
int sys = fcd->coding_category_by_priority[i];
if (decst.mask & (1 << sys))
@@
-2226,10
+2226,11
@@
COMPOSE_ADD_CHAR(struct decoding_stream *str,
{
if (CODING_SYSTEM_DISABLE_COMPOSITION (str->codesys))
DECODE_ADD_UCS_CHAR (character, dst);
{
if (CODING_SYSTEM_DISABLE_COMPOSITION (str->codesys))
DECODE_ADD_UCS_CHAR (character, dst);
- else if (!CHAR_ID_TABLE_P (str->combining_table))
+ else if (!CHAR_TABLEP (str->combining_table))
{
Lisp_Object ret
{
Lisp_Object ret
- = get_char_id_table (character, Vcharacter_composition_table);
+ = get_char_id_table (XCHAR_TABLE(Vcharacter_composition_table),
+ character);
if (NILP (ret))
DECODE_ADD_UCS_CHAR (character, dst);
if (NILP (ret))
DECODE_ADD_UCS_CHAR (character, dst);
@@
-2243,12
+2244,15
@@
COMPOSE_ADD_CHAR(struct decoding_stream *str,
else
{
Lisp_Object ret
else
{
Lisp_Object ret
- = get_char_id_table (character, str->combining_table);
+ = get_char_id_table (XCHAR_TABLE(str->combining_table),
+ character);
if (CHARP (ret))
{
Emchar char2 = XCHARVAL (ret);
if (CHARP (ret))
{
Emchar char2 = XCHARVAL (ret);
- ret = get_char_id_table (char2, Vcharacter_composition_table);
+ ret =
+ get_char_id_table (XCHAR_TABLE(Vcharacter_composition_table),
+ char2);
if (NILP (ret))
{
DECODE_ADD_UCS_CHAR (char2, dst);
if (NILP (ret))
{
DECODE_ADD_UCS_CHAR (char2, dst);
@@
-2262,7
+2266,7
@@
COMPOSE_ADD_CHAR(struct decoding_stream *str,
str->combining_table = ret;
}
}
str->combining_table = ret;
}
}
- else if (CHAR_ID_TABLE_P (ret))
+ else if (CHAR_TABLEP (ret))
{
str->combined_chars[str->combined_char_count++] = character;
str->combining_table = ret;
{
str->combined_chars[str->combined_char_count++] = character;
str->combining_table = ret;
@@
-5795,10
+5799,10
@@
vars_of_file_coding (void)
int i;
fcd = xnew (struct file_coding_dump);
int i;
fcd = xnew (struct file_coding_dump);
- dumpstruct (&fcd, &fcd_description);
+ dump_add_root_struct_ptr (&fcd, &fcd_description);
/* Initialize to something reasonable ... */
/* Initialize to something reasonable ... */
- for (i = 0; i <= CODING_CATEGORY_LAST; i++)
+ for (i = 0; i < CODING_CATEGORY_LAST; i++)
{
fcd->coding_category_system[i] = Qnil;
fcd->coding_category_by_priority[i] = i;
{
fcd->coding_category_system[i] = Qnil;
fcd->coding_category_by_priority[i] = i;
@@
-5862,7
+5866,7
@@
complex_vars_of_file_coding (void)
make_lisp_hash_table (50, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ);
the_codesys_prop_dynarr = Dynarr_new (codesys_prop);
make_lisp_hash_table (50, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ);
the_codesys_prop_dynarr = Dynarr_new (codesys_prop);
- dumpstruct (&the_codesys_prop_dynarr, &codesys_prop_dynarr_description);
+ dump_add_root_struct_ptr (&the_codesys_prop_dynarr, &codesys_prop_dynarr_description);
#define DEFINE_CODESYS_PROP(Prop_Type, Sym) do \
{ \
#define DEFINE_CODESYS_PROP(Prop_Type, Sym) do \
{ \
@@
-5938,7
+5942,7
@@
complex_vars_of_file_coding (void)
#if defined(MULE) && !defined(UTF2000)
{
#if defined(MULE) && !defined(UTF2000)
{
- unsigned int i;
+ size_t i;
for (i = 0; i < countof (fcd->ucs_to_mule_table); i++)
fcd->ucs_to_mule_table[i] = Qnil;
for (i = 0; i < countof (fcd->ucs_to_mule_table); i++)
fcd->ucs_to_mule_table[i] = Qnil;