projects
/
chise
/
xemacs-chise.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(U-0020523): Unify MH-0036 and M085318.
[chise/xemacs-chise.git]
/
src
/
chartab.c
diff --git
a/src/chartab.c
b/src/chartab.c
index
2c8181a
..
2f5c6b5
100644
(file)
--- a/
src/chartab.c
+++ b/
src/chartab.c
@@
-1740,8
+1740,10
@@
decode_char_table_range (Lisp_Object range, struct chartab_range *outrange)
{
if (EQ (range, Qt))
outrange->type = CHARTAB_RANGE_ALL;
{
if (EQ (range, Qt))
outrange->type = CHARTAB_RANGE_ALL;
+#ifdef UTF2000
else if (EQ (range, Qnil))
outrange->type = CHARTAB_RANGE_DEFAULT;
else if (EQ (range, Qnil))
outrange->type = CHARTAB_RANGE_DEFAULT;
+#endif
else if (CHAR_OR_CHAR_INTP (range))
{
outrange->type = CHARTAB_RANGE_CHAR;
else if (CHAR_OR_CHAR_INTP (range))
{
outrange->type = CHARTAB_RANGE_CHAR;
@@
-3087,10
+3089,12
@@
Store character's ATTRIBUTES.
(attributes))
{
Lisp_Object rest = attributes;
(attributes))
{
Lisp_Object rest = attributes;
- Lisp_Object code = Fcdr (Fassq (Qucs, attributes));
+ Lisp_Object code = Fcdr (Fassq (Qmap_ucs, attributes));
Lisp_Object character;
if (NILP (code))
Lisp_Object character;
if (NILP (code))
+ code = Fcdr (Fassq (Qucs, attributes));
+ if (NILP (code))
{
while (CONSP (rest))
{
{
while (CONSP (rest))
{