comparison src/unicode.c @ 5438:8d29f1c4bb98

Merge with 21.5 trunk.
author Mats Lidell <matsl@xemacs.org>
date Fri, 26 Nov 2010 06:43:36 +0100
parents 308d34e9f07d c096d8051f89
children 0af042a0c116
comparison
equal deleted inserted replaced
5437:002cb5224e4f 5438:8d29f1c4bb98
1367 { 1367 {
1368 Lisp_Object charset; 1368 Lisp_Object charset;
1369 int ichar, unicode; 1369 int ichar, unicode;
1370 1370
1371 CHECK_CHAR (character); 1371 CHECK_CHAR (character);
1372 CHECK_NATNUM (code); 1372
1373 check_integer_range (code, Qzero, make_integer (EMACS_INT_MAX));
1373 1374
1374 unicode = XINT (code); 1375 unicode = XINT (code);
1375 ichar = XCHAR (character); 1376 ichar = XCHAR (character);
1376 charset = ichar_charset (ichar); 1377 charset = ichar_charset (ichar);
1377 1378
1443 #ifdef MULE 1444 #ifdef MULE
1444 Lisp_Object_dynarr *dyn; 1445 Lisp_Object_dynarr *dyn;
1445 int lbs[NUM_LEADING_BYTES]; 1446 int lbs[NUM_LEADING_BYTES];
1446 int c; 1447 int c;
1447 1448
1448 CHECK_NATNUM (code); 1449 check_integer_range (code, Qzero, make_integer (EMACS_INT_MAX));
1449 c = XINT (code); 1450 c = XINT (code);
1450 { 1451 {
1451 EXTERNAL_LIST_LOOP_2 (elt, charsets) 1452 EXTERNAL_LIST_LOOP_2 (elt, charsets)
1452 Fget_charset (elt); 1453 Fget_charset (elt);
1453 } 1454 }
1469 if (ret == -1) 1470 if (ret == -1)
1470 return Qnil; 1471 return Qnil;
1471 return make_char (ret); 1472 return make_char (ret);
1472 } 1473 }
1473 #else 1474 #else
1474 CHECK_NATNUM (code); 1475 check_integer_range (code, Qzero, make_integer (EMACS_INT_MAX));
1475 return Fint_to_char (code); 1476 return Fint_to_char (code);
1476 #endif /* MULE */ 1477 #endif /* MULE */
1477 } 1478 }
1478 1479
1479 #ifdef MULE 1480 #ifdef MULE