diff options
| author | Karl Heuer <kwzh@gnu.org> | 1997-04-10 21:19:16 +0000 |
|---|---|---|
| committer | Karl Heuer <kwzh@gnu.org> | 1997-04-10 21:19:16 +0000 |
| commit | 5ecc2cfd817be7278494bf6d9ace8f2941b5b8d4 (patch) | |
| tree | 6a329f50e172b867c4ac15820f8b86b5fd708654 | |
| parent | ba3647bc487749696cd38a4d6838e02f3b395353 (diff) | |
| download | emacs-5ecc2cfd817be7278494bf6d9ace8f2941b5b8d4.tar.gz | |
(Fx_popup_menu): Don't use Lisp_Object as integer.
(set_frame_menubar): Likewise.
| -rw-r--r-- | src/xmenu.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index 819f81ea954..a3b5d060a22 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -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) { |