* src/keyboard.c (active_maps): Fcurrent_active_maps expects a position, not

an event.

* src/keyboard.c (active_maps): Fcurrent_active_maps expects a position, not
an event.
e31560a7 · Stefan Monnier · 5267e6d3 · e31560a7 · e31560a7
Commit e31560a7 authored Feb 14, 2013 by Stefan Monnier
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

src/ChangeLog src/ChangeLog +5 -0

src/keyboard.c src/keyboard.c +2 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2013-02-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* keyboard.c (active_maps): Fcurrent_active_maps expects a position, not
+	an event.
+
 2013-02-13  Stefan Monnier  <monnier@iro.umontreal.ca>
  
 	* keyboard.c (syms_of_keyboard): Further tweaks of docstring.

--- 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));
 }