comparison src/keymap.c @ 51034:a5bb1c5181ac

(Fset_keymap_parent, map_keymap, Fcopy_keymap) (Faccessible_keymaps): Pass new arg to map_char_table.

51033:8fe4bdd97052

      if (CHAR_TABLE_P (XCAR (list)))
	{
	  Lisp_Object indices[3];

	  map_char_table (fix_submap_inheritance, Qnil, XCAR (list),
			  keymap, 0, indices);
	}
    }

  RETURN_UNGCPRO (parent);

	    }
	}
      else if (CHAR_TABLE_P (binding))
	{
	  Lisp_Object indices[3];
	  map_char_table (map_keymap_char_table_item, Qnil, binding,
			  Fcons (make_save_value (fun, 0),
				 Fcons (make_save_value (data, 0),
					args)),
			  0, indices);
	}

      Lisp_Object elt = XCAR (keymap);
      if (CHAR_TABLE_P (elt))
	{
	  Lisp_Object indices[3];
	  elt = Fcopy_sequence (elt);
	  map_char_table (copy_keymap_1, Qnil, elt, elt, 0, indices);
	}
      else if (VECTORP (elt))
	{
	  int i;
	  elt = Fcopy_sequence (elt);

	  if (CHAR_TABLE_P (elt))
	    {
	      Lisp_Object indices[3];

	      map_char_table (accessible_keymaps_char_table, Qnil,
			      elt, Fcons (Fcons (maps, make_number (is_metized)),
					  Fcons (tail, thisseq)),
			      0, indices);
	    }
	  else if (VECTORP (elt))

	      args = Fcons (Fcons (Fcons (definition, noindirect),
				   Qnil), /* Result accumulator.  */
			    Fcons (Fcons (this, last),
				   Fcons (make_number (nomenus),
					  make_number (last_is_meta))));
	      map_char_table (where_is_internal_2, Qnil, elt, args,
			      0, indices);
	      sequences = XCDR (XCAR (args));
	    }
	  else if (CONSP (elt))
	    {

51034:a5bb1c5181ac

      if (CHAR_TABLE_P (XCAR (list)))
	{
	  Lisp_Object indices[3];

	  map_char_table (fix_submap_inheritance, Qnil,
			  XCAR (list), XCAR (list),
			  keymap, 0, indices);
	}
    }

  RETURN_UNGCPRO (parent);

	    }
	}
      else if (CHAR_TABLE_P (binding))
	{
	  Lisp_Object indices[3];
	  map_char_table (map_keymap_char_table_item, Qnil, binding, binding,
			  Fcons (make_save_value (fun, 0),
				 Fcons (make_save_value (data, 0),
					args)),
			  0, indices);
	}

      Lisp_Object elt = XCAR (keymap);
      if (CHAR_TABLE_P (elt))
	{
	  Lisp_Object indices[3];
	  elt = Fcopy_sequence (elt);
	  map_char_table (copy_keymap_1, Qnil, elt, elt, elt, 0, indices);
	}
      else if (VECTORP (elt))
	{
	  int i;
	  elt = Fcopy_sequence (elt);

	  if (CHAR_TABLE_P (elt))
	    {
	      Lisp_Object indices[3];

	      map_char_table (accessible_keymaps_char_table, Qnil, elt,
			      elt, Fcons (Fcons (maps, make_number (is_metized)),
					  Fcons (tail, thisseq)),
			      0, indices);
	    }
	  else if (VECTORP (elt))

	      args = Fcons (Fcons (Fcons (definition, noindirect),
				   Qnil), /* Result accumulator.  */
			    Fcons (Fcons (this, last),
				   Fcons (make_number (nomenus),
					  make_number (last_is_meta))));
	      map_char_table (where_is_internal_2, Qnil, elt, elt, args,
			      0, indices);
	      sequences = XCDR (XCAR (args));
	    }
	  else if (CONSP (elt))
	    {