Merge from trunk.

1 files changed, 7 insertions, 4 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.