# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1207928141 0
# Node ID d3bf833831d678adb52b44681bc5c054ec804928
# Parent  0ab0b9641d8013b359024dce819530cf1edd9354
* keymap.h (map_keymap_canonical): Declare.
* xmenu.c (single_keymap_panes): Use it.

diff -r 0ab0b9641d80 -r d3bf833831d6 src/ChangeLog
--- 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,
diff -r 0ab0b9641d80 -r d3bf833831d6 src/keymap.h
--- 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
 
diff -r 0ab0b9641d80 -r d3bf833831d6 src/xmenu.c
--- 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.  */