Merge from trunk.

2 files changed, 20 insertions, 11 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b63ff401090..4fd9dff1f32 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,10 +3,7 @@
         * alloc.c (mark_memory): Omit 3rd (offset) arg; caller changed.
         Don't assume EMACS_INT alignment is the same as pointer alignment.
         (GC_POINTER_ALIGNMENT): New macro.
-
-2011-10-02  Paul Eggert  <eggert@cs.ucla.edu>
-
-        * alloc.c (pure_bytes_used_lisp, pure_bytes_used_non_lisp):
+        (pure_bytes_used_lisp, pure_bytes_used_non_lisp):
         (allocate_vectorlike, buffer_memory_full, struct sdata, SDATA_SIZE)
         (string_bytes, check_sblock, allocate_string_data):
         (compact_small_strings, Fmake_bool_vector, make_string)
@@ -789,6 +786,12 @@
         rather than rolling our own approximation.
         (SCROLL_BAR_VEC_SIZE): Remove; not used.
 
+2011-10-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keyboard.c (read_key_sequence_remapped): New var.
+        (read_key_sequence): Compute remapping in the right buffer.
+        (command_loop_1): Use read_key_sequence's remapping directly.
+
 2011-10-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * dired.c (file_name_completion): Don't expand file name.
diff --git a/src/keyboard.c b/src/keyboard.c
index a771c9c4187..7c199b3ae14 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -252,6 +252,7 @@ static Lisp_Object Qtimer_event_handler;
 /* read_key_sequence stores here the command definition of the
    key sequence that it reads.  */
 static Lisp_Object read_key_sequence_cmd;
+static Lisp_Object read_key_sequence_remapped;
 
 static Lisp_Object Qinput_method_function;
 
@@ -1512,14 +1513,10 @@ command_loop_1 (void)
          reset it before we execute the command. */
       Vdeactivate_mark = Qnil;
 
-      /* Remap command through active keymaps */
+      /* Remap command through active keymaps.  */
       Vthis_original_command = cmd;
-      if (SYMBOLP (cmd))
-        {
-          Lisp_Object cmd1;
-          if (cmd1 = Fcommand_remapping (cmd, Qnil, Qnil), !NILP (cmd1))
-            cmd = cmd1;
-        }
+      if (!NILP (read_key_sequence_remapped))
+        cmd = read_key_sequence_remapped;
 
       /* Execute the command.  */
 
@@ -10004,6 +10001,13 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
     read_key_sequence_cmd = (first_binding < nmaps
                              ? defs[first_binding]
                              : Qnil);
+  read_key_sequence_remapped
+    /* Remap command through active keymaps.
+       Do the remapping here, before the unbind_to so it uses the keymaps
+       of the appropriate buffer.  */
+    = SYMBOLP (read_key_sequence_cmd)
+    ? Fcommand_remapping (read_key_sequence_cmd, Qnil, Qnil)
+    : Qnil;
 
   unread_switch_frame = delayed_switch_frame;
   unbind_to (count, Qnil);
@@ -11668,6 +11672,8 @@ syms_of_keyboard (void)
 
   read_key_sequence_cmd = Qnil;
   staticpro (&read_key_sequence_cmd);
+  read_key_sequence_remapped = Qnil;
+  staticpro (&read_key_sequence_remapped);
 
   menu_bar_one_keymap_changed_items = Qnil;
   staticpro (&menu_bar_one_keymap_changed_items);