c = reorder_modifiers (c);
keystring = concat2 (build_string (new_mods), XCDR (assoc));
- error ((modifiers & ~meta_modifier
- ? "To bind the key %s, use [?%s], not [%s]"
- : "To bind the key %s, use \"%s\", not [%s]"),
+ error ("To bind the key %s, use [?%s], not [%s]",
SDATA (SYMBOL_NAME (c)), SDATA (keystring),
SDATA (SYMBOL_NAME (c)));
}
/* Use malloc here. See the comment above this function.
Avoid realloc here; it causes spurious traps on GNU/Linux [KFS] */
block_input ();
- newmodes = malloc (allocsize);
+ newmodes = xmalloc_unsafe (allocsize);
if (newmodes)
{
if (cmm_modes)
{
memcpy (newmodes, cmm_modes,
cmm_size * sizeof cmm_modes[0]);
- free (cmm_modes);
+ xfree (cmm_modes);
}
cmm_modes = newmodes;
}
- newmaps = malloc (allocsize);
+ newmaps = xmalloc_unsafe (allocsize);
if (newmaps)
{
if (cmm_maps)
{
memcpy (newmaps, cmm_maps,
cmm_size * sizeof cmm_maps[0]);
- free (cmm_maps);
+ xfree (cmm_maps);
}
cmm_maps = newmaps;
}