Mercurial > emacs
changeset 96681:38b988607823
(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.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 15 Jul 2008 21:01:44 +0000 |
| parents | fb7776f6d5eb |
| children | a4460538cfb2 |
| files | src/ChangeLog src/keyboard.c |
| diffstat | 2 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Jul 15 20:58:09 2008 +0000 +++ b/src/ChangeLog Tue Jul 15 21:01:44 2008 +0000 @@ -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.
--- a/src/keyboard.c Tue Jul 15 20:58:09 2008 +0000 +++ b/src/keyboard.c Tue Jul 15 21:01:44 2008 +0000 @@ -7996,15 +7996,10 @@ /* 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))