[Emacs-diffs] /srv/bzr/emacs/trunk r111783: * src/keyboard.c (active_maps): Fcurrent_active_maps expects a position, not

[Stefan Monnier]

------------------------------------------------------------
revno: 111783
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2013-02-14 09:40:54 -0500
message:
  * src/keyboard.c (active_maps): Fcurrent_active_maps expects a position, not
  an event.
modified:
  src/ChangeLog
  src/keyboard.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-02-13 19:43:06 +0000
+++ b/src/ChangeLog     2013-02-14 14:40:54 +0000
@@ -1,3 +1,8 @@
+2013-02-14  Stefan Monnier  <address@hidden>
+
+       * keyboard.c (active_maps): Fcurrent_active_maps expects a position, not
+       an event.
+
 2013-02-13  Stefan Monnier  <address@hidden>
 
        * keyboard.c (syms_of_keyboard): Further tweaks of docstring.

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2013-02-13 19:43:06 +0000
+++ b/src/keyboard.c    2013-02-14 14:40:54 +0000
@@ -8644,7 +8644,8 @@
 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));
 }