(map_char_table): Fix previous change.

diff --git a/src/fns.c b/src/fns.c
index 25013aa189867bb52d3f301ce296449bb5c5f2a4..ff0f7cb481c99f44b282fa9d0cd33b80a16cdbb3 100644 (file)
--- a/src/fns.c
+++ b/src/fns.c
@@ -2697,13 +2697,15 @@ map_char_table (c_function, function, table, subtable, arg, depth, indices)
        {
          int c1, c2, c;
 
-         if (NILP (elt))
-           elt = XCHAR_TABLE (subtable)->defalt;
-         if (NILP  (elt))
-           elt = Faref (table, make_number (i));
          c1 = depth >= 1 ? XFASTINT (indices[1]) : 0;
          c2 = depth >= 2 ? XFASTINT (indices[2]) : 0;
          c = MAKE_CHAR (charset, c1, c2);
+
+         if (NILP (elt))
+           elt = XCHAR_TABLE (subtable)->defalt;
+         if (NILP  (elt))
+           elt = Faref (table, make_number (c));
+
          if (c_function)
            (*c_function) (arg, make_number (c), elt);
          else