+2011-08-02 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * keymap.c (Fdefine_key): Fix Lisp_Object/int mixup; apply some CSE.
+
2010-12-03 Don March <don@ohspite.net>
* keymap.c (Fdefine_key): Fix non-prefix key error message when
keymap = get_keymap (cmd, 0, 1);
if (!CONSP (keymap))
{
- char trailing_esc[5];
- if (c == meta_prefix_char && metized)
- {
- if (idx == 0)
- strcpy(trailing_esc, "ESC");
- else
- strcpy(trailing_esc, " ESC");
- }
- else
- strcpy(trailing_esc, "");
+ const char *trailing_esc = ((EQ (c, meta_prefix_char) && metized)
+ ? (idx == 0 ? "ESC" : " ESC")
+ : "");
/* We must use Fkey_description rather than just passing key to
error; key might be a vector, not a string. */