Merged from miles@gnu.org--gnu-2005 (patch 543)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-543
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-420

1 files changed, 4 insertions, 1 deletions

diff --git a/src/keymap.c b/src/keymap.c
index 9d67f4400c0..8fa4d91a9c7 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -743,7 +743,7 @@ usage: (map-keymap FUNCTION KEYMAP)  */)
     Fsignal (Qinvalid_function, Fcons (function, Qnil));
   if (! NILP (sort_first))
     return call3 (intern ("map-keymap-internal"), function, keymap, Qt);
-      
+
   map_keymap (keymap, map_keymap_call, function, NULL, 1);
   return Qnil;
 }
@@ -2837,6 +2837,9 @@ You type        Translation\n\
             insert (buf, bufend - buf);
 
             insert ("\n", 1);
+
+            /* Insert calls signal_after_change which may GC. */
+            translate = SDATA (Vkeyboard_translate_table);
           }
 
       insert ("\n", 1);