mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 21:20:53 -08:00
Code Issues Projects Releases Wiki Activity

* src/keymap.c (Fdefine_key): Fix Lisp_Object/int mixup; apply some CSE.

Browse source
This commit is contained in:
Stefan Monnier 2011-08-02 12:02:52 -04:00
parent 92f2affc50
commit fb33fa43b4
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
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

13
src/keymap.c
View file

@ -1217,16 +1217,9 @@ binding KEY to DEF is added at the front of KEYMAP. */)
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. */