Mercurial > emacs
changeset 105960:61e7ce7dcc26
menu.c (Fx_popup_menu): Remove left-over debugging code and rename variables to fix 2009-11-09 change.
| author | David Reitter <david.reitter@gmail.com> |
|---|---|
| date | Thu, 12 Nov 2009 00:26:09 +0000 |
| parents | ba3ffbd9c422 |
| children | 0a4854987918 |
| files | src/ChangeLog src/menu.c |
| diffstat | 2 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Nov 11 20:11:51 2009 +0000 +++ b/src/ChangeLog Thu Nov 12 00:26:09 2009 +0000 @@ -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.
--- a/src/menu.c Wed Nov 11 20:11:51 2009 +0000 +++ b/src/menu.c Thu Nov 12 00:26:09 2009 +0000 @@ -1074,10 +1074,6 @@ 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 @@ 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);