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

This commit is contained in:
David Reitter 2009-11-12 00:26:09 +00:00
parent 9143355208
commit cf54c75498
2 changed files with 7 additions and 6 deletions

View file

@ -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.

View file

@ -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);