# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 740186230 0
# Node ID 6506b2fd475a8ce458094c157c66359a9aeeaec6
# Parent  4a96c64c4d5e5a53b18fbdf354c3cd4832d1d127
(xmenu_show): Store 0 in *ERROR at the beginning.

(Fx_popup_menu): Call keymap_panes right in one-keymap case.

diff -r 4a96c64c4d5e -r 6506b2fd475a src/xmenu.c
--- a/src/xmenu.c	Tue Jun 15 23:11:38 1993 +0000
+++ b/src/xmenu.c	Tue Jun 15 23:17:10 1993 +0000
@@ -192,7 +192,7 @@
 
       /* Extract the detailed info to make one pane.  */
       number_of_panes = keymap_panes (&obj_list, &menus, &names, &enables,
-				      &items, &menu, 1);
+				      &items, &prefixes, &menu, 1);
       /* The menu title seems to be ignored,
 	 so put it in the pane title.  */
       if (menus[0] == 0)
@@ -329,6 +329,7 @@
   int ulx, uly, width, height;
   int dispwidth, dispheight;
 
+  *error = 0;
   if (pane_cnt == 0)
     return 0;