* keymap.h (map_keymap_canonical): Declare.

* xmenu.c (single_keymap_panes): Use it.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1bdc54014472dee32dabc0260f1a60b7be823c0e..2081beb13ec45076dcc865c9454d518a67980d25 100644 (file)
--- 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 64aa8a81156c8e84e2f1fb50a15639583ab548ed..027f710973adf76b23d071b95f5cc0ddf74b88b7 100644 (file)
--- 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 ad0ec34043cb34801813b0efe16695601ffb5d85..9c0dd18bb19d2790f389093e20e1b57cf84559e8 100644 (file)
--- 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.  */