diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-04-11 15:35:41 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-04-11 15:35:41 +0000 |
| commit | 492d9fd6bce2eba9138d00b8e1e2618ed6f6ea64 (patch) | |
| tree | 2740cb59c0ff95570a0e48af7d36a0295032f8bf /src | |
| parent | d87be1dfc8f886510a30574f7f4917c6cf4aa6c2 (diff) | |
| download | emacs-492d9fd6bce2eba9138d00b8e1e2618ed6f6ea64.tar.gz | |
* keymap.h (map_keymap_canonical): Declare.
* xmenu.c (single_keymap_panes): Use it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/keymap.h | 3 | ||||
| -rw-r--r-- | src/xmenu.c | 2 |
3 files changed, 9 insertions, 1 deletions
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 <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, 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. */ |