Commit d4323972 authored by Paul Eggert's avatar Paul Eggert
Browse files

* xmenu.c (xmenu_show): Rename parameter to avoid shadowing.

parent 9d66f88e
......@@ -2,6 +2,7 @@
 
* xmenu.c (menu_highlight_callback): Now static.
(set_frame_menubar): Remove unused local.
(xmenu_show): Rename parameter to avoid shadowing.
 
* xdisp.c (produce_glyphless_glyph): Initialize lower_xoff.
Add a FIXME comment, since the code still doesn't look right.
......@@ -1598,7 +1598,7 @@ create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv,
Lisp_Object
xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
Lisp_Object title, const char **error, EMACS_UINT timestamp)
Lisp_Object title, const char **error_name, EMACS_UINT timestamp)
{
int i;
widget_value *wv, *save_wv = 0, *first_wv = 0, *prev_wv = 0;
......@@ -1613,11 +1613,11 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
if (! FRAME_X_P (f))
abort ();
*error = NULL;
*error_name = NULL;
if (menu_items_used <= MENU_ITEMS_PANE_LENGTH)
{
*error = "Empty menu";
*error_name = "Empty menu";
return Qnil;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment