Mercurial > emacs
changeset 94005:d3bf833831d6
* keymap.h (map_keymap_canonical): Declare.
* xmenu.c (single_keymap_panes): Use it.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 11 Apr 2008 15:35:41 +0000 |
| parents | 0ab0b9641d80 |
| children | a4655455212b |
| files | src/ChangeLog src/keymap.h src/xmenu.c |
| diffstat | 3 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Apr 11 15:34:17 2008 +0000 +++ b/src/ChangeLog Fri Apr 11 15:35:41 2008 +0000 @@ -1,3 +1,8 @@ +2008-04-11 Stefan Monnier <monnier@iro.umontreal.ca> + + * keymap.h (map_keymap_canonical): Declare. + * xmenu.c (single_keymap_panes): Use it. + 2008-04-11 Glenn Morris <rgm@gnu.org> * eval.c (Fdefvaralias): If the alias is bound and the target is not,
--- a/src/keymap.h Fri Apr 11 15:34:17 2008 +0000 +++ b/src/keymap.h Fri Apr 11 15:35:41 2008 +0000 @@ -50,6 +50,9 @@ typedef void (*map_keymap_function_t) P_ ((Lisp_Object key, Lisp_Object val, Lisp_Object args, void* data)); extern void map_keymap P_ ((Lisp_Object map, map_keymap_function_t fun, Lisp_Object largs, void* cargs, int autoload)); +extern void map_keymap_canonical (Lisp_Object map, + map_keymap_function_t fun, + Lisp_Object args, void *data); #endif
--- a/src/xmenu.c Fri Apr 11 15:34:17 2008 +0000 +++ b/src/xmenu.c Fri Apr 11 15:35:41 2008 +0000 @@ -510,7 +510,7 @@ #endif GCPRO1 (skp.pending_maps); - map_keymap (keymap, single_menu_item, Qnil, &skp, 1); + map_keymap_canonical (keymap, single_menu_item, Qnil, &skp); UNGCPRO; /* Process now any submenus which want to be panes at this level. */