* keymap.c (store_in_keymap): Don't forget to QUIT in the

	keymap-scanning loop.  Don't treat vectors as binding tables if
	they're the wrong length.

	* keymap.c (store_in_keymap): Don't forget to QUIT in the
	keymap-scanning loop.  Don't treat vectors as binding tables if
	they're the wrong length.

1 files changed, 4 insertions, 0 deletions

diff --git a/src/keymap.c b/src/keymap.c
index b2ca9e11e94..a4105aeada1 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -355,6 +355,8 @@ store_in_keymap (keymap, idx, def)
         switch (XTYPE (elt))
           {
           case Lisp_Vector:
+            if (XVECTOR (elt)->size != DENSE_TABLE_SIZE)
+              break;
             if (XTYPE (idx) == Lisp_Int)
               {
                 XVECTOR (elt)->contents[XFASTINT (idx)] = def;
@@ -380,6 +382,8 @@ store_in_keymap (keymap, idx, def)
               goto keymap_end;
             break;
           }
+
+        QUIT;
       }
 
   keymap_end: