# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 860707156 0
# Node ID 57318977980450240334cd23555c641db315eda5
# Parent  0fe9203c7a06a0108d2b4527eac7c80fbadc0d7b
(Fx_popup_menu): Don't use Lisp_Object as integer.
(set_frame_menubar): Likewise.

diff -r 0fe9203c7a06 -r 573189779804 src/xmenu.c
--- 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)
 	{