Mercurial > emacs
diff src/xmenu.c @ 17364:573189779804
(Fx_popup_menu): Don't use Lisp_Object as integer.
(set_frame_menubar): Likewise.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Thu, 10 Apr 1997 21:19:16 +0000 |
parents | 6409ef81a2a8 |
children | 0a75fcee3cb8 |
line wrap: on
line diff
--- a/src/xmenu.c Thu Apr 10 21:16:33 1997 +0000 +++ b/src/xmenu.c Thu Apr 10 21:19:16 1997 +0000 @@ -856,8 +856,10 @@ 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 @@ 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) {