projects
/
chise
/
xemacs-chise.git.1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(M-15500): Unify J78-432E.
[chise/xemacs-chise.git.1]
/
src
/
chartab.c
diff --git
a/src/chartab.c
b/src/chartab.c
index
772c7b9
..
b7acb66
100644
(file)
--- a/
src/chartab.c
+++ b/
src/chartab.c
@@
-34,7
+34,7
@@
Boston, MA 02111-1307, USA. */
loosely based on the original Mule.
Jareth Hein: fixed a couple of bugs in the implementation, and
added regex support for categories with check_category_at
loosely based on the original Mule.
Jareth Hein: fixed a couple of bugs in the implementation, and
added regex support for categories with check_category_at
- MORIOKA Tomohiko: Rewritten for XEmacs UTF-2000
+ MORIOKA Tomohiko: Rewritten for XEmacs CHISE
*/
#include <config.h>
*/
#include <config.h>
@@
-2526,7
+2526,8
@@
put_char_table (Lisp_Char_Table *ct, struct chartab_range *range,
cell_max = i & 0xFF;
for (i = cell_min; i <= cell_max; i++)
{
cell_max = i & 0xFF;
for (i = cell_min; i <= cell_max; i++)
{
- Emchar ch = DECODE_CHAR (range->charset, (range->row << 8) | i);
+ Emchar ch
+ = DECODE_CHAR (range->charset, (range->row << 8) | i, 0);
if ( charset_code_point (range->charset, ch, 0) >= 0 )
put_char_id_table_0 (ct, ch, val);
if ( charset_code_point (range->charset, ch, 0) >= 0 )
put_char_id_table_0 (ct, ch, val);
@@
-2968,7
+2969,8
@@
map_char_table (Lisp_Char_Table *ct,
rainj.type = CHARTAB_RANGE_CHAR;
for (retval =0, i = cell_min; i <= cell_max && retval == 0; i++)
{
rainj.type = CHARTAB_RANGE_CHAR;
for (retval =0, i = cell_min; i <= cell_max && retval == 0; i++)
{
- Emchar ch = DECODE_CHAR (range->charset, (range->row << 8) | i);
+ Emchar ch
+ = DECODE_CHAR (range->charset, (range->row << 8) | i, 0);
if ( charset_code_point (range->charset, ch, 0) >= 0 )
{
if ( charset_code_point (range->charset, ch, 0) >= 0 )
{
@@
-3945,7
+3947,7
@@
Store character's ATTRIBUTES.
if (CONSP (cell))
character = Fmake_char (ccs, Fcar (cell), Fcar (Fcdr (cell)));
else
if (CONSP (cell))
character = Fmake_char (ccs, Fcar (cell), Fcar (Fcdr (cell)));
else
- character = Fdecode_char (ccs, cell, Qnil);
+ character = Fdecode_char (ccs, cell, Qnil, Qt);
if (!NILP (character))
goto setup_attributes;
}
if (!NILP (character))
goto setup_attributes;
}
@@
-4002,7
+4004,7
@@
Retrieve the character of the given ATTRIBUTES.
if (CONSP (cell))
return Fmake_char (ccs, Fcar (cell), Fcar (Fcdr (cell)));
else
if (CONSP (cell))
return Fmake_char (ccs, Fcar (cell), Fcar (Fcdr (cell)));
else
- return Fdecode_char (ccs, cell, Qnil);
+ return Fdecode_char (ccs, cell, Qnil, Qnil);
}
rest = Fcdr (rest);
}
}
rest = Fcdr (rest);
}