menu.c (Fx_popup_menu): Remove left-over debugging code and rename variables to fix...

diff --git a/src/ChangeLog b/src/ChangeLog
index 5389118f62224a68cdf8a9728a6d61567c939764..815d5dfa976236945ea803f936c5615085a7c232 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-11  David Reitter  <david.reitter@gmail.com>
+
+       * menu.c (Fx_popup_menu): Remove left-over debugging code and rename
+       variables to fix 2009-11-09 change.
+
 2009-11-11  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * process.c (ifflag_def): Make flag_sym constant.

diff --git a/src/menu.c b/src/menu.c
index 44eebe8dbe7a2198cbeeb9913cc50eedb50e9d9e..313327d47217bbe7e1cb7c0bac2472bc5d09cc25 100644 (file)
--- a/src/menu.c
+++ b/src/menu.c
@@ -1074,10 +1074,6 @@ no quit occurs and `x-popup-menu' returns nil.  */)
   Lisp_Object timestamp = Qnil;
   struct gcpro gcpro1;
 
-#ifdef HAVE_NS
-  NSTRACE (ns_popup_menu);
-#endif
-
   if (NILP (position))
     /* This is an obsolete call, which wants us to precompute the
        keybinding equivalents, but we don't do that any more anyway.  */
@@ -1187,8 +1183,8 @@ no quit occurs and `x-popup-menu' returns nil.  */)
        f = XFRAME (WINDOW_FRAME (win));
 
 #ifdef HAVE_NS              /* FIXME: Is this necessary??  --Stef  */
-       p.x = FRAME_COLUMN_WIDTH (f) * WINDOW_LEFT_EDGE_COL (win);
-       p.y = FRAME_LINE_HEIGHT (f) * WINDOW_TOP_EDGE_LINE (win);
+        xpos = FRAME_COLUMN_WIDTH (f) * WINDOW_LEFT_EDGE_COL (win);
+       ypos = FRAME_LINE_HEIGHT (f) * WINDOW_TOP_EDGE_LINE (win);
 #else
        xpos = WINDOW_LEFT_EDGE_X (win);
        ypos = WINDOW_TOP_EDGE_Y (win);