(map_char_table): Fix previous change.

fdf91be0 · Richard M. Stallman · 1fd1cc2f · fdf91be0
Commit fdf91be0 authored May 17, 2003 by Richard M. Stallman
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

src/fns.c src/fns.c +6 -4

No files found.
--- 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