[Emacs-diffs] emacs/src ChangeLog menu.c

[David Reitter]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     David Reitter <davidswelt>      09/11/12 00:26:11

Modified files:
        src            : ChangeLog menu.c 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7860&r2=1.7861
http://cvs.savannah.gnu.org/viewcvs/emacs/src/menu.c?cvsroot=emacs&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7860
retrieving revision 1.7861
diff -u -b -r1.7860 -r1.7861
--- ChangeLog   11 Nov 2009 20:11:51 -0000      1.7860
+++ ChangeLog   12 Nov 2009 00:26:09 -0000      1.7861
@@ -1,3 +1,8 @@
+2009-11-11  David Reitter  <address@hidden>
+
+       * menu.c (Fx_popup_menu): Remove left-over debugging code and rename
+       variables to fix 2009-11-09 change.
+
 2009-11-11  Dan Nicolaescu  <address@hidden>
 
        * process.c (ifflag_def): Make flag_sym constant.

Index: menu.c
===================================================================
RCS file: /sources/emacs/emacs/src/menu.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- menu.c      10 Nov 2009 18:07:10 -0000      1.18
+++ menu.c      12 Nov 2009 00:26:11 -0000      1.19
@@ -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);