Mercurial > emacs
changeset 88592:46a07af4f6e0
(Fmake_char): Fix previous change.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Wed, 22 May 2002 03:50:18 +0000 |
parents | b8eb49355bfe |
children | 90960cccb15d |
files | src/charset.c |
diffstat | 1 files changed, 28 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/src/charset.c Tue May 21 16:08:00 2002 +0000 +++ b/src/charset.c Wed May 22 03:50:18 2002 +0000 @@ -1502,44 +1502,45 @@ if (XFASTINT (code1) >= 0x100) args_out_of_range (make_number (0xFF), code1); code = XFASTINT (code1); - } - if (dimension > 1) - { - code <<= 8; - if (NILP (code2)) - code |= charsetp->code_space[(dimension - 2) * 4]; - else - { - CHECK_NATNUM (code2); - if (XFASTINT (code2) >= 0x100) - args_out_of_range (make_number (0xFF), code2); - code |= XFASTINT (code2); - } - if (dimension > 2) + if (dimension > 1) { code <<= 8; - if (NILP (code3)) - code |= charsetp->code_space[(dimension - 3) * 4]; + if (NILP (code2)) + code |= charsetp->code_space[(dimension - 2) * 4]; else { - CHECK_NATNUM (code3); - if (XFASTINT (code3) >= 0x100) - args_out_of_range (make_number (0xFF), code3); - code |= XFASTINT (code3); + CHECK_NATNUM (code2); + if (XFASTINT (code2) >= 0x100) + args_out_of_range (make_number (0xFF), code2); + code |= XFASTINT (code2); } - if (dimension > 3) + if (dimension > 2) { code <<= 8; - if (NILP (code4)) - code |= charsetp->code_space[0]; + if (NILP (code3)) + code |= charsetp->code_space[(dimension - 3) * 4]; else { - CHECK_NATNUM (code4); - if (XFASTINT (code4) >= 0x100) - args_out_of_range (make_number (0xFF), code4); - code |= XFASTINT (code4); + CHECK_NATNUM (code3); + if (XFASTINT (code3) >= 0x100) + args_out_of_range (make_number (0xFF), code3); + code |= XFASTINT (code3); + } + + if (dimension > 3) + { + code <<= 8; + if (NILP (code4)) + code |= charsetp->code_space[0]; + else + { + CHECK_NATNUM (code4); + if (XFASTINT (code4) >= 0x100) + args_out_of_range (make_number (0xFF), code4); + code |= XFASTINT (code4); + } } } }