(Fmake_char): Fix previous change.

diff --git a/src/ChangeLog b/src/ChangeLog
index a0565923cd78d8b406a649cb509253ffa4c20cad..20d05d474943a9eb593a0cc6df9998aa0586a70c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-22  Kenichi Handa  <handa@etl.go.jp>
+
+       * charset.c (Fmake_char): Fix previous change.
+
 2002-05-21  Kenichi Handa  <handa@etl.go.jp>
 
        * coding.c (ONE_MORE_BYTE_NO_CHECK): Increment consumed_chars.

diff --git a/src/charset.c b/src/charset.c
index d7516dc1ba31134bc88480c3161585c86710b04d..93ad3e8b61f726540a0d1d772f98f81bc16eed9e 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -1502,44 +1502,45 @@ is specified.  */)
       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);
+                   }
                }
            }
        }