procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
If the cache doesn't work, let's fix it, rather than work around it.
This commit is contained in:
Stefan Monnier 2008-07-15 21:01:44 +00:00
parent e953d75ceb
commit 0a1700794a
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ChangeLog
View file

@ -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.

11
src/keyboard.c
View file

@ -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))