diff options
| author | Stefan Monnier | 2008-07-15 21:01:44 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2008-07-15 21:01:44 +0000 |
| commit | 0a1700794a034d9e7aaa82d0ebddc8b35aa255ef (patch) | |
| tree | 3f2930b7ea4849c6ac8ce9fb98ec65bbaba3c9d0 /src/keyboard.c | |
| parent | e953d75ceb48922b62dbd2248c6282accf8861ca (diff) | |
| download | emacs-0a1700794a034d9e7aaa82d0ebddc8b35aa255ef.tar.gz emacs-0a1700794a034d9e7aaa82d0ebddc8b35aa255ef.zip | |
(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.
Diffstat (limited to 'src/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 11 |
1 files changed, 3 insertions, 8 deletions
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) | |||
| 7996 | /* With the introduction of where_is_cache, the computation | 7996 | /* With the introduction of where_is_cache, the computation |
| 7997 | of equivalent key bindings is sufficiently fast that we | 7997 | of equivalent key bindings is sufficiently fast that we |
| 7998 | do not need to cache it here any more. */ | 7998 | do not need to cache it here any more. */ |
| 7999 | /*PENDING: under NS this effect does not hold, perhaps due to the | 7999 | /* CHECK_IMPURE (start); |
| 8000 | modifier-preference changes to where-is-internal.. */ | 8000 | XSETCDR (start, Fcons (Fcons (Qnil, Qnil), XCDR (start))); |
| 8001 | #ifdef HAVE_NS | 8001 | cachelist = XCAR (XCDR (start)); */ |
| 8002 | CHECK_IMPURE (start); | ||
| 8003 | XSETCDR (start, Fcons (Fcons (Qnil, Qnil), XCDR (start))); | ||
| 8004 | cachelist = XCAR (XCDR (start)); | ||
| 8005 | #else | ||
| 8006 | cachelist = Fcons (Qnil, Qnil); | 8002 | cachelist = Fcons (Qnil, Qnil); |
| 8007 | #endif | ||
| 8008 | newcache = 1; | 8003 | newcache = 1; |
| 8009 | tem = AREF (item_properties, ITEM_PROPERTY_KEYEQ); | 8004 | tem = AREF (item_properties, ITEM_PROPERTY_KEYEQ); |
| 8010 | if (!NILP (keyhint)) | 8005 | if (!NILP (keyhint)) |