From e31560a79130b8f477883a9a32253cb1ed3b3ef2 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 14 Feb 2013 09:40:54 -0500 Subject: [PATCH] * src/keyboard.c (active_maps): Fcurrent_active_maps expects a position, not an event. --- src/ChangeLog | 5 +++++ src/keyboard.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 82cc8f0f552..3c9ea256547 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2013-02-14 Stefan Monnier + + * keyboard.c (active_maps): Fcurrent_active_maps expects a position, not + an event. + 2013-02-13 Stefan Monnier * keyboard.c (syms_of_keyboard): Further tweaks of docstring. diff --git a/src/keyboard.c b/src/keyboard.c index 47507483859..fe1c3d77eb6 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -8644,7 +8644,8 @@ follow_key (Lisp_Object keymap, Lisp_Object key) static Lisp_Object active_maps (Lisp_Object first_event) { - Lisp_Object position = INTEGERP (first_event) ? Qnil : first_event; + Lisp_Object position + = CONSP (first_event) ? CAR_SAFE (XCDR (first_event)) : Qnil; return Fcons (Qkeymap, Fcurrent_active_maps (Qt, position)); } -- 2.39.5