2 files changed, 9 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9c5c073fc79..cff5c24b1fd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keyboard.c (parse_menu_item): Do not cache key shortcut any more.
+
 2008-05-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * macterm.c (x_draw_relief_rect): Remove unused variable `dpy'.
diff --git a/src/keyboard.c b/src/keyboard.c
index c41815cf3c5..5a8b0d1c0cf 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -7986,8 +7986,11 @@ parse_menu_item (item, notreal, inmenubar)
   if (NILP (cachelist))
     {
       /* We have to create a cachelist.  */
-      CHECK_IMPURE (start);
-      XSETCDR (start, Fcons (Fcons (Qnil, Qnil), XCDR (start)));
+      /* With the introduction of where_is_cache, the computation
+         of equivalent key bindings is sufficiently fast that we
+         do not need to cache it here any more. */
+      /* CHECK_IMPURE (start);
+         XSETCDR (start, Fcons (Fcons (Qnil, Qnil), XCDR (start))); */
       cachelist = XCAR (XCDR (start));
       newcache = 1;
       tem = AREF (item_properties, ITEM_PROPERTY_KEYEQ);