projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update.
[chise/xemacs-chise.git-]
/
src
/
chartab.c
diff --git
a/src/chartab.c
b/src/chartab.c
index
43f7849
..
f5ee443
100644
(file)
--- a/
src/chartab.c
+++ b/
src/chartab.c
@@
-37,7
+37,6
@@
Boston, MA 02111-1307, USA. */
#include <config.h>
#include "lisp.h"
#include <config.h>
#include "lisp.h"
-#include <stddef.h>
#include "buffer.h"
#include "chartab.h"
#include "buffer.h"
#include "chartab.h"
@@
-357,7
+356,7
@@
print_char_table (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
#ifdef MULE
{
#ifdef MULE
{
- int i;
+ Charset_ID i;
for (i = MIN_LEADING_BYTE; i < MIN_LEADING_BYTE + NUM_LEADING_BYTES;
i++)
for (i = MIN_LEADING_BYTE; i < MIN_LEADING_BYTE + NUM_LEADING_BYTES;
i++)
@@
-768,14
+767,22
@@
decode_char_table_range (Lisp_Object range, struct chartab_range *outrange)
/* called from CHAR_TABLE_VALUE(). */
Lisp_Object
/* called from CHAR_TABLE_VALUE(). */
Lisp_Object
-get_non_ascii_char_table_value (struct Lisp_Char_Table *ct, int leading_byte,
- Emchar c)
+get_non_ascii_char_table_value (struct Lisp_Char_Table *ct,
+ Charset_ID leading_byte, Emchar c)
{
Lisp_Object val;
{
Lisp_Object val;
+#ifdef UTF2000
+ Lisp_Object charset;
+#else
Lisp_Object charset = CHARSET_BY_LEADING_BYTE (leading_byte);
Lisp_Object charset = CHARSET_BY_LEADING_BYTE (leading_byte);
+#endif
int byte1, byte2;
int byte1, byte2;
+#ifdef UTF2000
+ BREAKUP_CHAR (c, charset, byte1, byte2);
+#else
BREAKUP_CHAR_1_UNSAFE (c, charset, byte1, byte2);
BREAKUP_CHAR_1_UNSAFE (c, charset, byte1, byte2);
+#endif
val = ct->level1[leading_byte - MIN_LEADING_BYTE];
if (CHAR_TABLE_ENTRYP (val))
{
val = ct->level1[leading_byte - MIN_LEADING_BYTE];
if (CHAR_TABLE_ENTRYP (val))
{
@@
-812,7
+819,7
@@
get_char_table (Emchar ch, struct Lisp_Char_Table *ct)
val = ct->ascii[byte1 + 128];
else
{
val = ct->ascii[byte1 + 128];
else
{
- int lb = XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE;
+ Charset_ID lb = XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE;
val = ct->level1[lb];
if (CHAR_TABLE_ENTRYP (val))
{
val = ct->level1[lb];
if (CHAR_TABLE_ENTRYP (val))
{
@@
-1067,7
+1074,8
@@
put_char_table (struct Lisp_Char_Table *ct, struct chartab_range *range,
}
else
{
}
else
{
- int lb = XCHARSET_LEADING_BYTE (range->charset) - MIN_LEADING_BYTE;
+ Charset_ID lb
+ = XCHARSET_LEADING_BYTE (range->charset) - MIN_LEADING_BYTE;
ct->level1[lb] = val;
}
break;
ct->level1[lb] = val;
}
break;
@@
-1075,7
+1083,8
@@
put_char_table (struct Lisp_Char_Table *ct, struct chartab_range *range,
case CHARTAB_RANGE_ROW:
{
struct Lisp_Char_Table_Entry *cte;
case CHARTAB_RANGE_ROW:
{
struct Lisp_Char_Table_Entry *cte;
- int lb = XCHARSET_LEADING_BYTE (range->charset) - MIN_LEADING_BYTE;
+ Charset_ID lb
+ = XCHARSET_LEADING_BYTE (range->charset) - MIN_LEADING_BYTE;
/* make sure that there is a separate entry for the row. */
if (!CHAR_TABLE_ENTRYP (ct->level1[lb]))
ct->level1[lb] = make_char_table_entry (ct->level1[lb]);
/* make sure that there is a separate entry for the row. */
if (!CHAR_TABLE_ENTRYP (ct->level1[lb]))
ct->level1[lb] = make_char_table_entry (ct->level1[lb]);
@@
-1099,7
+1108,7
@@
put_char_table (struct Lisp_Char_Table *ct, struct chartab_range *range,
else
{
struct Lisp_Char_Table_Entry *cte;
else
{
struct Lisp_Char_Table_Entry *cte;
- int lb = XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE;
+ Charset_ID lb = XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE;
/* make sure that there is a separate entry for the row. */
if (!CHAR_TABLE_ENTRYP (ct->level1[lb]))
ct->level1[lb] = make_char_table_entry (ct->level1[lb]);
/* make sure that there is a separate entry for the row. */
if (!CHAR_TABLE_ENTRYP (ct->level1[lb]))
ct->level1[lb] = make_char_table_entry (ct->level1[lb]);
@@
-1260,7
+1269,7
@@
map_over_charset_row (struct Lisp_Char_Table_Entry *cte,
static int
static int
-map_over_other_charset (struct Lisp_Char_Table *ct, int lb,
+map_over_other_charset (struct Lisp_Char_Table *ct, Charset_ID lb,
int (*fn) (struct chartab_range *range,
Lisp_Object val, void *arg),
void *arg)
int (*fn) (struct chartab_range *range,
Lisp_Object val, void *arg),
void *arg)
@@
-1337,9
+1346,9
@@
map_char_table (struct Lisp_Char_Table *ct,
if (retval)
return retval;
{
if (retval)
return retval;
{
- int i;
- int start = MIN_LEADING_BYTE;
- int stop = start + NUM_LEADING_BYTES;
+ Charset_ID i;
+ Charset_ID start = MIN_LEADING_BYTE;
+ Charset_ID stop = start + NUM_LEADING_BYTES;
for (i = start, retval = 0; i < stop && retval == 0; i++)
{
for (i = start, retval = 0; i < stop && retval == 0; i++)
{
@@
-1358,7
+1367,8
@@
map_char_table (struct Lisp_Char_Table *ct,
case CHARTAB_RANGE_ROW:
{
case CHARTAB_RANGE_ROW:
{
- Lisp_Object val = ct->level1[XCHARSET_LEADING_BYTE (range->charset) - MIN_LEADING_BYTE];
+ Lisp_Object val = ct->level1[XCHARSET_LEADING_BYTE (range->charset)
+ - MIN_LEADING_BYTE];
if (!CHAR_TABLE_ENTRYP (val))
{
struct chartab_range rainj;
if (!CHAR_TABLE_ENTRYP (val))
{
struct chartab_range rainj;