/* Manipulation of keymaps
- Copyright (C) 1985-1988, 1993-1995, 1998-2013 Free Software
+ Copyright (C) 1985-1988, 1993-1995, 1998-2014 Free Software
Foundation, Inc.
This file is part of GNU Emacs.
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;
}
static void
accessible_keymaps_1 (Lisp_Object key, Lisp_Object cmd, Lisp_Object args, void *data)
-/* Use void* data to be compatible with map_keymap_function_t. */
+/* Use void * data to be compatible with map_keymap_function_t. */
{
struct accessible_keymaps_data *d = data; /* Cast! */
Lisp_Object maps = d->maps;
Vminor_mode_overriding_map_alist = Qnil;
DEFVAR_LISP ("emulation-mode-map-alists", Vemulation_mode_map_alists,
- doc: /* List of keymap alists to use for emulations modes.
+ doc: /* List of keymap alists to use for emulation modes.
It is intended for modes or packages using multiple minor-mode keymaps.
Each element is a keymap alist just like `minor-mode-map-alist', or a
symbol with a variable binding which is a keymap alist, and it is used