(parse_menu_item): Don't use cachelist, even under NS.

If the cache doesn't work, let's fix it, rather than work around it.

diff --git a/src/ChangeLog b/src/ChangeLog
index 82880993feca17dda0ec5ac6390bfce21f163033..f3c60cd43e2577eb90c817c506eed294e555f2cc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * keyboard.c (parse_menu_item): Don't use cachelist, even under NS.
+       If the cache doesn't work, let's fix it, rather than work around it.
+
 2008-07-15  Adrian Robert <Adrian.B.Robert@gmail.com>
 
        * Makefile.in: Correct additions for nsfont.o in last commit.
@@ -61,7 +66,7 @@
        (x_build_heuristic_mask, syms_of_image): Add NS support parallel to
        other GUIs, including XPM support using code originally written for
        Carbon GUI.
-       (png_load, jpeg_load, tiff_load, gif_load): Added implementations
+       (png_load, jpeg_load, tiff_load, gif_load): Add implementations
        using NS API.
        (image_ascent): Use font metrics macros instead of direct struct field
        access.

diff --git a/src/keyboard.c b/src/keyboard.c
index b908b8ad349a1e4b19412e55deb5a51495805be8..f6ec7671904dbf4ba0ebd5f239740234a0f77e75 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -7996,15 +7996,10 @@ parse_menu_item (item, notreal, inmenubar)
       /* 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. */
-/*PENDING: under NS this effect does not hold, perhaps due to the
-           modifier-preference changes to where-is-internal.. */
-#ifdef HAVE_NS
-       CHECK_IMPURE (start);
-       XSETCDR (start, Fcons (Fcons (Qnil, Qnil), XCDR (start)));
-       cachelist = XCAR (XCDR (start));
-#else
+      /* CHECK_IMPURE (start);
+         XSETCDR (start, Fcons (Fcons (Qnil, Qnil), XCDR (start)));
+        cachelist = XCAR (XCDR (start));  */
       cachelist = Fcons (Qnil, Qnil);
-#endif
       newcache = 1;
       tem = AREF (item_properties, ITEM_PROPERTY_KEYEQ);
       if (!NILP (keyhint))