From: Stefan Monnier Date: Fri, 11 Apr 2008 15:35:41 +0000 (+0000) Subject: * keymap.h (map_keymap_canonical): Declare. X-Git-Tag: emacs-pretest-23.0.90~6328 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=492d9fd6bce2eba9138d00b8e1e2618ed6f6ea64;p=emacs.git * keymap.h (map_keymap_canonical): Declare. * xmenu.c (single_keymap_panes): Use it. --- diff --git a/src/ChangeLog b/src/ChangeLog index 1bdc5401447..2081beb13ec 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-04-11 Stefan Monnier + + * keymap.h (map_keymap_canonical): Declare. + * xmenu.c (single_keymap_panes): Use it. + 2008-04-11 Glenn Morris * eval.c (Fdefvaralias): If the alias is bound and the target is not, diff --git a/src/keymap.h b/src/keymap.h index 64aa8a81156..027f710973a 100644 --- a/src/keymap.h +++ b/src/keymap.h @@ -50,6 +50,9 @@ extern void keys_of_keymap P_ ((void)); 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 diff --git a/src/xmenu.c b/src/xmenu.c index ad0ec34043c..9c0dd18bb19 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -510,7 +510,7 @@ single_keymap_panes (keymap, pane_name, prefix, notreal, maxdepth) #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. */