From 0a1700794a034d9e7aaa82d0ebddc8b35aa255ef Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 15 Jul 2008 21:01:44 +0000 Subject: [PATCH] (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. --- src/ChangeLog | 7 ++++++- src/keyboard.c | 11 +++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 82880993fec..f3c60cd43e2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-07-15 Stefan Monnier + + * 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 * 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 b908b8ad349..f6ec7671904 100644 --- 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)) -- 2.39.2