Commit 99d3fac7 authored by Karl Heuer's avatar Karl Heuer
Browse files

(Fx_popup_menu): Don't use Lisp_Object as integer.

(set_frame_menubar): Likewise.
parent 10ffbb91
......@@ -856,8 +856,10 @@ cached information about equivalent key sequences.")
CHECK_LIVE_WINDOW (window, 0);
f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
xpos = (FONT_WIDTH (f->output_data.x->font) * XWINDOW (window)->left);
ypos = (f->output_data.x->line_height * XWINDOW (window)->top);
xpos = (FONT_WIDTH (f->output_data.x->font)
* XFASTINT (XWINDOW (window)->left));
ypos = (f->output_data.x->line_height
* XFASTINT (XWINDOW (window)->top));
}
else
/* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,
......@@ -1733,7 +1735,7 @@ set_frame_menubar (f, first_time, deep_p)
for (i = 0; i < previous_menu_items_used; i++)
if (menu_items_used == i
|| (previous_items[i] != XVECTOR (menu_items)->contents[i]))
|| (!EQ (previous_items[i], XVECTOR (menu_items)->contents[i])))
break;
if (i == menu_items_used && i == previous_menu_items_used && i != 0)
{
......
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